From c31aa5d38f8dfe8d0bdfa9e1e584b095f624ae63 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Wed, 22 Jan 2014 21:01:13 +0000
Subject: [PATCH] Log channel UUID by default

We want people to have this on so that when we're looking at reported
log files we can tell what is going on.
---
 conf/vanilla/autoload_configs/logfile.conf.xml               | 4 ++--
 conf/vanilla/autoload_configs/syslog.conf.xml                | 4 ++--
 .../mod_logfile/conf/autoload_configs/logfile.conf.xml       | 4 ++--
 src/mod/loggers/mod_logfile/mod_logfile.c                    | 5 +++--
 .../loggers/mod_syslog/conf/autoload_configs/syslog.conf.xml | 4 ++--
 src/mod/loggers/mod_syslog/mod_syslog.c                      | 1 +
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/conf/vanilla/autoload_configs/logfile.conf.xml b/conf/vanilla/autoload_configs/logfile.conf.xml
index 65bea552bd..546db4abaf 100644
--- a/conf/vanilla/autoload_configs/logfile.conf.xml
+++ b/conf/vanilla/autoload_configs/logfile.conf.xml
@@ -13,8 +13,8 @@
 		<!-- Maximum number of log files to keep before wrapping -->
 		<!-- If this parameter is enabled, the log filenames will not include a date stamp -->
 		<!-- <param name="maximum-rotate" value="32"/> -->
-		<!-- Uncomment to prefix all log lines by the session's uuid  -->
-		<!-- <param name="uuid" value="true" /> -->
+        <!-- Prefix all log lines by the session's uuid  -->
+        <param name="uuid" value="true" />
       </settings>
       <mappings>
 	<!-- 
diff --git a/conf/vanilla/autoload_configs/syslog.conf.xml b/conf/vanilla/autoload_configs/syslog.conf.xml
index 636a12c8c1..7a06e8f3b0 100644
--- a/conf/vanilla/autoload_configs/syslog.conf.xml
+++ b/conf/vanilla/autoload_configs/syslog.conf.xml
@@ -12,7 +12,7 @@
     <param name="facility" value="user"/>
     <param name="ident" value="freeswitch"/>
     <param name="loglevel" value="warning"/>
-	<!-- Uncomment the following line to log uuids in syslogs (when applicable) -->
-    <!-- <param name="uuid" value="true"/> -->
+    <!-- log uuids in syslogs -->
+    <param name="uuid" value="true"/>
   </settings>
 </configuration>
diff --git a/src/mod/loggers/mod_logfile/conf/autoload_configs/logfile.conf.xml b/src/mod/loggers/mod_logfile/conf/autoload_configs/logfile.conf.xml
index 65bea552bd..546db4abaf 100644
--- a/src/mod/loggers/mod_logfile/conf/autoload_configs/logfile.conf.xml
+++ b/src/mod/loggers/mod_logfile/conf/autoload_configs/logfile.conf.xml
@@ -13,8 +13,8 @@
 		<!-- Maximum number of log files to keep before wrapping -->
 		<!-- If this parameter is enabled, the log filenames will not include a date stamp -->
 		<!-- <param name="maximum-rotate" value="32"/> -->
-		<!-- Uncomment to prefix all log lines by the session's uuid  -->
-		<!-- <param name="uuid" value="true" /> -->
+        <!-- Prefix all log lines by the session's uuid  -->
+        <param name="uuid" value="true" />
       </settings>
       <mappings>
 	<!-- 
diff --git a/src/mod/loggers/mod_logfile/mod_logfile.c b/src/mod/loggers/mod_logfile/mod_logfile.c
index 1ed171c783..ab85dc5f16 100644
--- a/src/mod/loggers/mod_logfile/mod_logfile.c
+++ b/src/mod/loggers/mod_logfile/mod_logfile.c
@@ -325,6 +325,7 @@ static switch_status_t load_profile(switch_xml_t xml)
 	new_profile->name = switch_core_strdup(module_pool, switch_str_nil(name));
 
 	new_profile->suffix = 1;
+	new_profile->log_uuid = SWITCH_TRUE;
 
 	if ((settings = switch_xml_child(xml, "settings"))) {
 		for (param = switch_xml_child(settings, "param"); param; param = param->next) {
@@ -339,8 +340,8 @@ static switch_status_t load_profile(switch_xml_t xml)
 				if (new_profile->max_rot == 0) {
 					new_profile->max_rot = MAX_ROT;
 				}
-			} else if (!strcmp(var, "uuid") && switch_true(val)) {
-				new_profile->log_uuid = SWITCH_TRUE;
+			} else if (!strcmp(var, "uuid")) {
+				new_profile->log_uuid = switch_true(val);
 			}
 		}
 	}
diff --git a/src/mod/loggers/mod_syslog/conf/autoload_configs/syslog.conf.xml b/src/mod/loggers/mod_syslog/conf/autoload_configs/syslog.conf.xml
index 636a12c8c1..7a06e8f3b0 100644
--- a/src/mod/loggers/mod_syslog/conf/autoload_configs/syslog.conf.xml
+++ b/src/mod/loggers/mod_syslog/conf/autoload_configs/syslog.conf.xml
@@ -12,7 +12,7 @@
     <param name="facility" value="user"/>
     <param name="ident" value="freeswitch"/>
     <param name="loglevel" value="warning"/>
-	<!-- Uncomment the following line to log uuids in syslogs (when applicable) -->
-    <!-- <param name="uuid" value="true"/> -->
+    <!-- log uuids in syslogs -->
+    <param name="uuid" value="true"/>
   </settings>
 </configuration>
diff --git a/src/mod/loggers/mod_syslog/mod_syslog.c b/src/mod/loggers/mod_syslog/mod_syslog.c
index 045b9831ab..d0fe2dea1d 100644
--- a/src/mod/loggers/mod_syslog/mod_syslog.c
+++ b/src/mod/loggers/mod_syslog/mod_syslog.c
@@ -181,6 +181,7 @@ static switch_status_t load_config(void)
 
 	/* default facility */
 	globals.facility = DEFAULT_FACILITY;
+	globals.log_uuid = SWITCH_TRUE;
 
 	if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);