Changing config file logging section name to follow the naming

convention
neutrinolabs · Oct 19, 2020 · 65347e4 · 65347e4
1 parent 04dff6a
commit 65347e4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/common/log.h b/common/log.h
@@ -52,7 +52,7 @@ enum logReturns
 };
 
 #define SESMAN_CFG_LOGGING            "Logging"
-#define SESMAN_CFG_LOGGING_LOGGER     "Logging_PerLogger"
+#define SESMAN_CFG_LOGGING_LOGGER     "LoggingPerLogger"
 #define SESMAN_CFG_LOG_FILE           "LogFile"
 #define SESMAN_CFG_LOG_LEVEL          "LogLevel"
 #define SESMAN_CFG_LOG_ENABLE_CONSOLE "EnableConsole"
@@ -77,12 +77,12 @@ enum logReturns
  * 
  * Note: when the build is configured with --enable-xrdpdebug, then 
  *      the log level can be configured per the source file name or method name 
- *      (with the suffix "()") in the [Logging_PerLogger]
+ *      (with the suffix "()") in the [LoggingPerLogger]
  *      section of the configuration file.
  * 
  *      For example:
  *      ```     
- *      [Logging_PerLogger]
+ *      [LoggingPerLogger]
  *      xrdp.c=DEBUG
  *      main()=WARNING
  *      ```

diff --git a/docs/man/sesman.ini.5.in b/docs/man/sesman.ini.5.in
@@ -85,13 +85,13 @@ relative path to \fI@xrdpconfdir@\fR. If not specified, defaults to
 \fI@xrdpconfdir@/reconnectwm.sh\fR.
 
 .SH "LOGGING"
-Following parameters can be used in the \fB[Logging]\fR and \fB[Chansrv_Logging]\fR 
+Following parameters can be used in the \fB[Logging]\fR and \fB[ChansrvLogging]\fR 
 sections.
 
 .TP
 \fBLogFile\fR=\fIfilename\fR
 Log file path. It can be either absolute or relative. If not specified,
-defaults to \fI./sesman.log\fR It is ignored in the [Chansrv_Logging] section
+defaults to \fI./sesman.log\fR It is ignored in the [ChansrvLogging] section
 since the channel server creates one log file per display and instead uses the
 following log file naming convention \fIxrdp-chansrv.${DISPLAY}.log\fR
 

diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c
@@ -1768,7 +1768,7 @@ main(int argc, char **argv)
         g_file_delete(log_file);
     }
 
-    logconfig = log_config_init_from_config(config_path, "xrdp-chansrv", "Chansrv_");
+    logconfig = log_config_init_from_config(config_path, "xrdp-chansrv", "Chansrv");
     if (logconfig->log_file != NULL)
     {
         g_free(logconfig->log_file);

diff --git a/sesman/sesman.ini.in b/sesman/sesman.ini.in
@@ -73,7 +73,7 @@ EnableSyslog=true
 #ConsoleLevel=INFO
 #EnableProcessId=false
 
-[Logging_PerLogger]
+[LoggingPerLogger]
 ; Note: per logger configuration is only used in XRDP_DEBUG builds of XRDP.
 #sesman.c=INFO
 #main()=INFO
@@ -120,7 +120,7 @@ FuseMountName=thinclient_drives
 ; Make this more permissive (e.g. 022) if required.
 FileUmask=077
 
-[Chansrv_Logging]
+[ChansrvLogging]
 ; Note: one log file is created per display and the LogFile config value 
 ; is ignored. The channel server log file names follow the naming convention: 
 ; xrdp-chansrv.${DISPLAY}.log
@@ -133,7 +133,7 @@ EnableSyslog=true
 #ConsoleLevel=INFO
 #EnableProcessId=false
 
-[Chansrv_Logging_PerLogger]
+[ChansrvLoggingPerLogger]
 ; Note: per logger configuration is only used in XRDP_DEBUG builds of XRDP.
 #chansrv.c=INFO
 #main()=INFO

diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in
@@ -158,7 +158,7 @@ EnableSyslog=true
 #ConsoleLevel=INFO
 #EnableProcessId=false
 
-[Logging_PerLogger]
+[LoggingPerLogger]
 ; Note: per logger configuration is only used in XRDP_DEBUG builds of XRDP.
 #xrdp.c=INFO
 #main()=INFO

diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c
@@ -590,7 +590,7 @@ xrdp_wm_login_fill_in_combo(struct xrdp_wm *self, struct xrdp_bitmap *b)
         if ((g_strncasecmp(p, "globals", 255) == 0)
                 || (g_strncasecmp(p, "channels", 255) == 0)
                 || (g_strncasecmp(p, "Logging", 255) == 0)
-                || (g_strncasecmp(p, "Logging_PerLogger", 255) == 0))
+                || (g_strncasecmp(p, "LoggingPerLogger", 255) == 0))
         {
         }
         else

diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
@@ -664,7 +664,7 @@ xrdp_wm_init(struct xrdp_wm *self)
                 q = (char *)list_get_item(names, index);
                 if ((g_strncasecmp("globals", q, 8) != 0) &&
                     (g_strncasecmp("Logging", q, 8) != 0) &&
-                    (g_strncasecmp("Logging_PerLogger", q, 18) != 0) &&
+                    (g_strncasecmp("LoggingPerLogger", q, 17) != 0) &&
                     (g_strncasecmp("channels", q, 9) != 0))
                 {
                     g_strncpy(default_section_name, q, 255);