From cd1ebfef2788350ea66f538316edcb2a74025cf5 Mon Sep 17 00:00:00 2001
From: Yanis Guenane <yanis.guenane@enovance.com>
Date: Fri, 11 Jul 2014 00:54:24 -0400
Subject: [PATCH] logging: Add ':' after process to be syslog compliant

---
 manifests/compute.pp        | 6 +++---
 manifests/identity.pp       | 6 +++---
 manifests/image/api.pp      | 6 +++---
 manifests/image/registry.pp | 6 +++---
 manifests/network.pp        | 6 +++---
 manifests/orchestration.pp  | 6 +++---
 manifests/telemetry.pp      | 6 +++---
 manifests/volume.pp         | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/manifests/compute.pp b/manifests/compute.pp
index 20af5bf7..a1250291 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -100,10 +100,10 @@ class cloud::compute(
   if $use_syslog {
     $log_dir = false
     nova_config {
-      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d: %(levelname)s %(name)s [%(request_id)s %(user)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d: %(levelname)s %(name)s [-] %(instance)s%(message)s';
       'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d: TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/nova'
diff --git a/manifests/identity.pp b/manifests/identity.pp
index 32d1f9f9..e5e193e9 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -455,10 +455,10 @@ class cloud::identity (
     $log_dir  = false
     $log_file = false
     keystone_config {
-      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d: %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d: %(levelname)s %(name)s [-] %(instance)s%(message)s';
       'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d: TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir  = '/var/log/keystone'
diff --git a/manifests/image/api.pp b/manifests/image/api.pp
index b064dba3..22e45f22 100644
--- a/manifests/image/api.pp
+++ b/manifests/image/api.pp
@@ -104,10 +104,10 @@ class cloud::image::api(
     $log_file_api      = false
     $log_file_registry = false
     glance_api_config {
-      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d: %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d: %(levelname)s %(name)s [-] %(instance)s%(message)s';
       'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d: TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir           = '/var/log/glance'
diff --git a/manifests/image/registry.pp b/manifests/image/registry.pp
index 75c50af1..cc05cd53 100644
--- a/manifests/image/registry.pp
+++ b/manifests/image/registry.pp
@@ -78,10 +78,10 @@ class cloud::image::registry(
     $log_file_api      = false
     $log_file_registry = false
     glance_registry_config {
-      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d: %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d: %(levelname)s %(name)s [-] %(instance)s%(message)s';
       'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d: TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir           = '/var/log/glance'
diff --git a/manifests/network.pp b/manifests/network.pp
index b6656151..bb6ef4b9 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -101,10 +101,10 @@ class cloud::network(
   if $use_syslog {
     $log_dir = false
     neutron_config {
-      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d: %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d: %(levelname)s %(name)s [-] %(instance)s%(message)s';
       'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d: TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/neutron'
diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp
index 27829b04..880ff8bd 100644
--- a/manifests/orchestration.pp
+++ b/manifests/orchestration.pp
@@ -118,10 +118,10 @@ class cloud::orchestration(
   if $use_syslog {
     $log_dir = false
     heat_config {
-      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d: %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d: %(levelname)s %(name)s [-] %(instance)s%(message)s';
       'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d: TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/heat'
diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp
index d432b7a7..84701542 100644
--- a/manifests/telemetry.pp
+++ b/manifests/telemetry.pp
@@ -89,10 +89,10 @@ class cloud::telemetry(
   if $use_syslog {
     $log_dir = false
     ceilometer_config {
-      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d: %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d: %(levelname)s %(name)s [-] %(instance)s%(message)s';
       'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d: TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/ceilometer'
diff --git a/manifests/volume.pp b/manifests/volume.pp
index 449a6ae1..6c3882f8 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -75,10 +75,10 @@ class cloud::volume(
   if $use_syslog {
     $log_dir = false
     cinder_config {
-      'DEFAULT/logging_context_format_string': value => '%(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
-      'DEFAULT/logging_default_format_string': value => '%(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s';
+      'DEFAULT/logging_context_format_string': value => '%(process)d: %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s';
+      'DEFAULT/logging_default_format_string': value => '%(process)d: %(levelname)s %(name)s [-] %(instance)s%(message)s';
       'DEFAULT/logging_debug_format_suffix': value => '%(funcName)s %(pathname)s:%(lineno)d';
-      'DEFAULT/logging_exception_prefix': value => '%(process)d TRACE %(name)s %(instance)s';
+      'DEFAULT/logging_exception_prefix': value => '%(process)d: TRACE %(name)s %(instance)s';
     }
   } else {
     $log_dir = '/var/log/cinder'