Merge branch 'main' into sh_expand

Author: Robert McLay

contrib/Bright/SitePackage.lua

@@ -73,22 +73,25 @@ local function l_report_loads()
    local openlog
    local syslog
    local closelog
+   local logInfo
    if (posix.syslog) then
       if (type(posix.syslog) == "table" ) then
          -- Support new style posix.syslog table
          openlog  = posix.syslog.openlog
          syslog   = posix.syslog.syslog
          closelog = posix.syslog.closelog
+         logInfo  = posix.syslog.LOG_INFO
       else
          -- Support original style posix.syslog functions
          openlog  = posix.openlog
          syslog   = posix.syslog
          closelog = posix.closelog
+         logInfo  = 6
       end
 
       openlog("ModuleUsageTracking")
       for k,msg in pairs(s_msgT) do
-         syslog(posix.syslog.LOG_INFO, msg)
+         syslog(logInfo, msg)
       end
       closelog()
    else

contrib/tracking_module_usage/gen_1/SitePackage.lua

@@ -77,22 +77,25 @@ local function l_report_loads()
    local openlog
    local syslog
    local closelog
+   local logInfo
    if (posix.syslog) then
       if (type(posix.syslog) == "table" ) then
          -- Support new style posix.syslog table
          openlog  = posix.syslog.openlog
          syslog   = posix.syslog.syslog
          closelog = posix.syslog.closelog
+         logInfo  = posix.syslog.LOG_INFO
       else
          -- Support original style posix.syslog functions
          openlog  = posix.openlog
          syslog   = posix.syslog
          closelog = posix.closelog
+         logInfo  = 6
       end
 
       openlog("ModuleUsageTracking")
       for i = 1, #s_msgA do
-         syslog(posix.syslog.LOG_INFO, s_msgA[i])
+         syslog(logInfo, s_msgA[i])
       end
       closelog()
    else

contrib/tracking_module_usage/gen_2/SitePackage.lua

@@ -77,22 +77,25 @@ local function l_report_loads()
    local openlog
    local syslog
    local closelog
+   local logInfo
    if (posix.syslog) then
       if (type(posix.syslog) == "table" ) then
          -- Support new style posix.syslog table
          openlog  = posix.syslog.openlog
          syslog   = posix.syslog.syslog
          closelog = posix.syslog.closelog
+         logInfo  = posix.syslog.LOG_INFO
       else
          -- Support original style posix.syslog functions
          openlog  = posix.openlog
          syslog   = posix.syslog
          closelog = posix.closelog
+         logInfo  = 6
       end
 
       openlog("ModuleUsageTracking")
       for i = 1, #s_msgA do
-         syslog(posix.syslog.LOG_INFO, s_msgA[i])
+         syslog(logInfo, s_msgA[i])
       end
       closelog()
    else

docs/source/300_tracking_module_usage.rst

@@ -102,22 +102,25 @@ Use SitePackage.lua to send a message to syslog.::
       local openlog
       local syslog
       local closelog
+      local logInfo
       if (posix.syslog) then
          if (type(posix.syslog) == "table" ) then
             -- Support new style posix.syslog table
             openlog  = posix.syslog.openlog
             syslog   = posix.syslog.syslog
             closelog = posix.syslog.closelog
+            logInfo  = posix.syslog.LOG_INFO
          else
             -- Support original style posix.syslog functions
             openlog  = posix.openlog
             syslog   = posix.syslog
             closelog = posix.closelog
+            logInfo  = 6
          end
 
          openlog("ModuleUsageTracking")
          for k,msg in pairs(s_msgT) do
-            syslog(posix.syslog.LOG_INFO, msg)
+            syslog(logInfo, msg)
          end
          closelog()
       else