Bug 36954: (follow-up) Return to the two logfiles pattern

Note that --errlog should refer to all output from the wrapper daemon
process only like respawning processes etc.
And that --output should refer to all output from the daemonized
client process (so in our case the SIP server).

Moving a few sip.log occurrences to sip-output in that regard.

Test plan:
Restart koha-sip.
Login to sip server.
Restart koha-sip.
Verify that you see Net::Server messages and traces from the login in the
-output log. The restarts are not found however in -error. See my comment
on the BZ report.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

debian/koha-common.postinst

@@ -177,7 +177,7 @@ for site in $(koha-list); do
         cat <<EOF >>$log4perl_config
 log4perl.logger.sip = DEBUG, SIP
 log4perl.appender.SIP=Log::Log4perl::Appender::File
-log4perl.appender.SIP.filename=/var/log/koha/$site/sip.log
+log4perl.appender.SIP.filename=/var/log/koha/$site/sip-output.log
 log4perl.appender.SIP.mode=append
 log4perl.appender.SIP.layout=PatternLayout
 log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %X{accountid}@%X{peeraddr}: %m %l%n

debian/koha-core.postinst

@@ -177,7 +177,7 @@ for site in $(koha-list); do
         cat <<EOF >>$log4perl_config
 log4perl.logger.sip = DEBUG, SIP
 log4perl.appender.SIP=Log::Log4perl::Appender::File
-log4perl.appender.SIP.filename=/var/log/koha/$site/sip.log
+log4perl.appender.SIP.filename=/var/log/koha/$site/sip-output.log
 log4perl.appender.SIP.mode=append
 log4perl.appender.SIP.layout=PatternLayout
 log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %X{accountid}@%X{peeraddr}: %m %l%n

debian/scripts/koha-sip

@@ -77,7 +77,8 @@ start_sip()
             fi
 
             DAEMONOPTS="--name=${name}-koha-sip \
-                    --output=/var/log/koha/${name}/sip.log \
+                    --errlog=/var/log/koha/${name}/sip-error.log \
+                    --output=/var/log/koha/${name}/sip-output.log \
                     --verbose=1 \
                     --respawn \
                     --delay=30 \
@@ -115,7 +116,8 @@ stop_sip()
     if is_sip_running $name; then
 
         DAEMONOPTS="--name=${name}-koha-sip \
-                    --output=/var/log/koha/${name}/sip.log \
+                    --errlog=/var/log/koha/${name}/sip-error.log \
+                    --output=/var/log/koha/${name}/sip-output.log \
                     --verbose=1 \
                     --respawn \
                     --delay=30 \
@@ -227,7 +229,7 @@ _check_and_fix_perms()
 {
     local name=$1
 
-    local files="/var/log/koha/${name}/sip.log"
+    local files="/var/log/koha/${name}/sip-error.log /var/log/koha/${name}/sip-output.log"
 
     for file in ${files}
     do

debian/templates/log4perl-site.conf.in

@@ -32,7 +32,7 @@ log4perl.appender.API.utf8=1
 
 log4perl.logger.sip = DEBUG, SIP
 log4perl.appender.SIP=Log::Log4perl::Appender::File
-log4perl.appender.SIP.filename=__LOG_DIR__/sip.log
+log4perl.appender.SIP.filename=__LOG_DIR__/sip-output.log
 log4perl.appender.SIP.mode=append
 log4perl.appender.SIP.layout=PatternLayout
 log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %X{accountid}@%X{peeraddr}: %m{chomp} %l%n

etc/log4perl.conf

@@ -39,7 +39,7 @@ log4perl.appender.API.utf8=1
 
 log4perl.logger.sip = DEBUG, SIP
 log4perl.appender.SIP=Log::Log4perl::Appender::File
-log4perl.appender.SIP.filename=__LOG_DIR__/sip.log
+log4perl.appender.SIP.filename=__LOG_DIR__/sip-output.log
 log4perl.appender.SIP.mode=append
 log4perl.appender.SIP.layout=PatternLayout
 log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %X{accountid}@%X{peeraddr}: %m %l%n