[#453] Add rsyslog config for iRODS and start rsyslog

docker-test-framework/4-3/Dockerfile.consumer

@@ -21,6 +21,9 @@ RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | apt-key add -;
 
 EXPOSE 1247 1248
 
+# Configure rsyslog for iRODS.
+COPY irods.rsyslog /etc/rsyslog.d/00-irods.conf
+
 # Set command to execute when launching the container.
 ADD start_consumer.sh irods_consumer.input /
 RUN chmod u+x /start_consumer.sh

docker-test-framework/4-3/Dockerfile.provider

@@ -28,6 +28,9 @@ RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | apt-key add -;
 
 EXPOSE 1247 1248
 
+# Configure rsyslog for iRODS.
+COPY irods.rsyslog /etc/rsyslog.d/00-irods.conf
+
 # Set command to execute when launching the container.
 ADD start_provider.sh /
 ADD testsetup-consortium.sh /

docker-test-framework/4-3/irods.rsyslog

@@ -0,0 +1,8 @@
+$FileCreateMode 0644
+$DirCreateMode 0755
+$Umask 0000
+$template irods_format,"%msg%\n"
+:programname,startswith,"irodsServer" /var/log/irods/irods.log;irods_format
+& stop
+:programname,startswith,"irodsDelayServer" /var/log/irods/irods.log;irods_format
+& stop

docker-test-framework/4-3/start_consumer.sh

@@ -15,6 +15,10 @@ until nc -z $topo_provider 1247; do
     sleep 1
 done
 
+# Rsyslog must be started before iRODS so that the log messages
+# are written to the correct file.
+rsyslogd
+
 # Set up iRODS.
 python3 /var/lib/irods/scripts/setup_irods.py < /irods_consumer.input
 su - irods -c './irodsctl -v start'

docker-test-framework/4-3/start_provider.sh

@@ -10,6 +10,10 @@ do
 done
 echo Postgres took approximately $counter seconds to fully start ...
 
+# Rsyslog must be started before iRODS so that the log messages
+# are written to the correct file.
+rsyslogd
+
 # Set up iRODS.
 python3 /var/lib/irods/scripts/setup_irods.py < /var/lib/irods/packaging/localhost_setup_postgres.input
 su - irods -c './irodsctl -v start'