local config=$1
local component=$2
- if [ grep -q -x "log4perl.logger.$component" $config ]; then
+ if grep -q "log4perl.logger.$component" $config; then
return 0
else
return 1
# Take care of the instance's log4perl.conf file
for site in $(koha-list); do
log4perl_config="/etc/koha/sites/$site/log4perl.conf"
- if [ !log4perl_component $log4perl_config "z3950" ]; then
+ if ! log4perl_component $log4perl_config "z3950"; then
cat <<EOF >> $log4perl_config
log4perl.logger.z3950 = WARN, Z3950
log4perl.appender.Z3950=Log::Log4perl::Appender::File
log4perl.appender.Z3950.filename=/var/log/koha/$site/z3950-error.log
log4perl.appender.Z3950.mode=append
log4perl.appender.Z3950.layout=PatternLayout
-log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l %n
+log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l%n
log4perl.appender.Z3950.utf8=1
EOF
fi
- if [ !log4perl_component $log4perl_config "api" ]; then
+ if ! log4perl_component $log4perl_config "api"; then
cat <<EOF >> $log4perl_config
log4perl.logger.api = WARN, API
log4perl.appender.API=Log::Log4perl::Appender::File
log4perl.appender.API.filename=/var/log/koha/$site/api-error.log
log4perl.appender.API.mode=append
log4perl.appender.API.layout=PatternLayout
-log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l %n
+log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l%n
log4perl.appender.API.utf8=1
EOF
for site in $(koha-list); do
log4perl_config="/etc/koha/sites/$site/log4perl.conf"
- if [ !log4perl_component $log4perl_config "sip" ]; then
+ if ! log4perl_component $log4perl_config "sip"; then
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.mode=append
log4perl.appender.SIP.layout=PatternLayout
-log4perl.appender.SIP.layout.ConversionPattern=[%d] [%p] %X{accountid}@%X{peeraddr}: %m %l %n
+log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %X{accountid}@%X{peeraddr}: %m %l%n
log4perl.appender.SIP.utf8=1
EOF
fi
done
+for site in $(koha-list); do
+ log4perl_config="/etc/koha/sites/$site/log4perl.conf"
+ if ! log4perl_component $log4perl_config "plack-opac"; then
+ cat <<EOF >> $log4perl_config
+log4perl.logger.plack-opac = WARN, PLACKOPAC
+log4perl.appender.PLACKOPAC=Log::Log4perl::Appender::File
+log4perl.appender.PLACKOPAC.filename=/var/log/koha/$site/plack-opac-error.log
+log4perl.appender.PLACKOPAC.mode=append
+log4perl.appender.PLACKOPAC.layout=PatternLayout
+log4perl.appender.PLACKOPAC.layout.ConversionPattern=[%d] [%p] %m%n
+log4perl.appender.PLACKOPAC.utf8=1
+
+EOF
+ fi
+done
+
+for site in $(koha-list); do
+ log4perl_config="/etc/koha/sites/$site/log4perl.conf"
+ if ! log4perl_component $log4perl_config "plack-api"; then
+ cat <<EOF >> $log4perl_config
+log4perl.logger.plack-api = WARN, PLACKAPI
+log4perl.appender.PLACKAPI=Log::Log4perl::Appender::File
+log4perl.appender.PLACKAPI.filename=/var/log/koha/$site/plack-api-error.log
+log4perl.appender.PLACKAPI.mode=append
+log4perl.appender.PLACKAPI.layout=PatternLayout
+log4perl.appender.PLACKAPI.layout.ConversionPattern=[%d] [%p] %m%n
+log4perl.appender.PLACKAPI.utf8=1
+
+EOF
+ fi
+done
+
+for site in $(koha-list); do
+ log4perl_config="/etc/koha/sites/$site/log4perl.conf"
+ if ! log4perl_component $log4perl_config "plack-intranet"; then
+ cat <<EOF >> $log4perl_config
+log4perl.logger.plack-intranet = WARN, PLACKINTRANET
+log4perl.appender.PLACKINTRANET=Log::Log4perl::Appender::File
+log4perl.appender.PLACKINTRANET.filename=/var/log/koha/$site/plack-intranet-error.log
+log4perl.appender.PLACKINTRANET.mode=append
+log4perl.appender.PLACKINTRANET.layout=PatternLayout
+log4perl.appender.PLACKINTRANET.layout.ConversionPattern=[%d] [%p] %m%n
+log4perl.appender.PLACKINTRANET.utf8=1
+
+EOF
+ fi
+done
+
+for site in $(koha-list); do
+ log4perl_config="/etc/koha/sites/$site/log4perl.conf"
+ if ! log4perl_component $log4perl_config "worker"; then
+ cat <<EOF >> $log4perl_config
+log4perl.logger.worker = WARN, WORKER
+log4perl.appender.WORKER=Log::Log4perl::Appender::Screen
+log4perl.appender.WORKER.stderr=1
+log4perl.appender.WORKER.layout=PatternLayout
+log4perl.appender.WORKER.layout.ConversionPattern=[%d] [%p] %m %l%n
+log4perl.appender.WORKER.utf8=1
+
+EOF
+ fi
+done
+
+for site in $(koha-list); do
+ kohaconfig="/etc/koha/sites/$site/koha-conf.xml"
+ logdir="$( xmlstarlet sel -t -v 'yazgfs/config/logdir' $kohaconfig )"
+ if [ "$logdir" != "" ] && [ "$logdir" != "0" ]; then
+ chown -R $site-koha:$site-koha $logdir
+ else
+ chown -R $site-koha:$site-koha /var/log/koha/$site
+ fi
+done
+
# Bug 14106 - fix the modulePath of existing koha instances so that it'll
# continue to work. This will only patch the files if the exact original string
# that we're fixing them from is there, so we just run it every time. Maybe
db_stop
+rabbitmq-plugins enable rabbitmq_stomp
+service rabbitmq-server restart
+
# Bug 18250: Correct startup order of koha-common and memcached
# Since the init script has been updated, we can force the order in rc.d
# by disabling and enabling again.