From fca7926374e7f30a5c435678f76d26b619758020 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= <f.demians@tamil.fr>
Date: Fri, 27 Nov 2009 18:16:55 +0100
Subject: [PATCH] Bug 3814: SIP2 Server logging doesn't work on OpenSolaris

This patch put in SIPconfig.xml SIP2 server logging parameters. This is
way it's possible to modify where SIP2 logs are sent. And fix
OpenSolaris bug.

WARNING: After an upgrade, installation using a custom SIP2 server
config file will need to copy default SIPconfig.xml added section:

<!--
  Set Net::Server::PreFork runtime parameters
  syslog_ident will identify SIP2 Koha server entries in syslog
  For OpenSolaris, add: syslog_logsock=stream
-->
  <server-params
    min_servers='1'
    min_spare_servers='0'
    log_file='Sys::Syslog'
    syslog_ident='koha_sip'
    syslog_facility='local6'
  />
---
 C4/SIP/SIPServer.pm  | 10 +---------
 C4/SIP/SIPconfig.xml | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/C4/SIP/SIPServer.pm b/C4/SIP/SIPServer.pm
index 55b2380f73..c6de11e464 100644
--- a/C4/SIP/SIPServer.pm
+++ b/C4/SIP/SIPServer.pm
@@ -59,16 +59,8 @@ foreach my $svc (keys %{$config->{listeners}}) {
 # Jun 16 21:21:31 server08 steve_sip[19305]: ILS::Transaction::Checkout performing checkout...
 # [  TIMESTAMP  ] [ HOST ] [ IDENT ]  PID  : Message...
 #
-# The IDENT is determined by $ENV{KOHA_SIP_LOG_IDENT}, if present.
-# Otherwise it is "_sip" appended to $USER, if present, or "acs-server" as a fallback.
-#  
+# The IDENT is determined by config file 'server-params' arguments
 
-my $syslog_ident = $ENV{KOHA_SIP_LOG_IDENT} || ($ENV{USER} ? $ENV{USER} . "_sip" : 'acs-server');
-
-push @parms,
-    "log_file=Sys::Syslog",
-    "syslog_ident=$syslog_ident",
-    "syslog_facility=" . LOG_SIP;
 
 #
 # Server Management: set parameters for the Net::Server::PreFork
diff --git a/C4/SIP/SIPconfig.xml b/C4/SIP/SIPconfig.xml
index 0e5f05ed31..f229b9a51b 100644
--- a/C4/SIP/SIPconfig.xml
+++ b/C4/SIP/SIPconfig.xml
@@ -2,10 +2,18 @@
 <!-- above address gets nothing, it's just a namespace -->
   <error-detect enabled="true" />
 
-<!-- Set Net::Server::PreFork runtime parameters -->
-<!--  <server-params
-           min_servers='1'
-           min_spare_servers='0' /> -->
+<!--
+  Set Net::Server::PreFork runtime parameters 
+  syslog_ident will identify SIP2 Koha server entries in syslog
+  For OpenSolaris, add: syslog_logsock=stream
+-->
+  <server-params
+    min_servers='1'
+    min_spare_servers='0' 
+    log_file='Sys::Syslog'
+    syslog_ident='koha_sip'
+    syslog_facility='local6'
+  />
   
   <listeners>
 <!-- vestigial HTTP, never implemented: just use the OPAC!
-- 
2.20.1