Make logging facility configurable

diff --git a/config.php.sample b/config.php.sample
index a23b41b3192cec813849f0608828ad94fd28b7af..4f8f715bebf7f877628253a3813bb387225b2ce6 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -36,6 +36,9 @@ $config['site']['path'] = 'laconica';
 // If you want logging sent to a file instead of syslog
 // $config['site']['logfile'] = '/tmp/laconica.log';
 
+// Change the syslog facility that Laconica logs to
+// $config['syslog']['facility'] = LOG_LOCAL7;
+
 // Enables extra log information, for example full details of PEAR DB errors
 // $config['site']['logdebug'] = true;
 

diff --git a/lib/common.php b/lib/common.php
index 5d451463b9ed9f4e794f67bc980becf80ea60fb8..14be747bc7a65db1ac31f44bbfc2c9899c71ad51 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -124,7 +124,8 @@ $config =
               'dupelimit' => 60), # default for same person saying the same thing
         'syslog' =>
         array('appname' => 'laconica', # for syslog
-              'priority' => 'debug'), # XXX: currently ignored
+              'priority' => 'debug', # XXX: currently ignored
+              'facility' => LOG_USER),
         'queue' =>
         array('enabled' => false,
               'subsystem' => 'db', # default to database, or 'stomp'

diff --git a/lib/util.php b/lib/util.php
index 461ca15c15dbb0cf20c4c67ecbc5021520e90462..d4d79afb30c25fc76d405887a5f2c2e06ffe80ec 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -1098,7 +1098,8 @@ function common_ensure_syslog()
 {
     static $initialized = false;
     if (!$initialized) {
-        openlog(common_config('syslog', 'appname'), 0, LOG_USER);
+        openlog(common_config('syslog', 'appname'), 0,
+            common_config('syslog', 'facility'));
         $initialized = true;
     }
 }