Merge pull request #88 from gwu-libraries/t87-apache_logs

refs #87. Redirected apache logs to stdout/stderr and updated docs.

docker/app-dev/Dockerfile

@@ -36,6 +36,9 @@ RUN a2dissite 000-default
 #Data volume
 ADD invoke.sh /opt/
 RUN chmod +x /opt/invoke.sh
+#Forward request and error logs to docker log collector
+RUN ln -sf /dev/stdout /var/log/apache2/access.log
+RUN ln -sf /dev/stderr /var/log/apache2/error.log
 WORKDIR /opt/sfm-ui
 ENV DJANGO_SETTINGS_MODULE=sfm.settings.docker_settings
 CMD ["/opt/invoke.sh"]

docker/app-master/Dockerfile

@@ -41,6 +41,9 @@ RUN mkdir /var/sfm && chmod ugo+w /var/sfm
 VOLUME /var/sfm
 ADD invoke.sh /opt/
 RUN chmod +x /opt/invoke.sh
+#Forward request and error logs to docker log collector
+RUN ln -sf /dev/stdout /var/log/apache2/access.log
+RUN ln -sf /dev/stderr /var/log/apache2/error.log
 WORKDIR /opt/sfm-ui
 CMD ["/opt/invoke.sh"]
 ENV DJANGO_SETTINGS_MODULE=sfm.settings.docker_settings

docker/app-prod/Dockerfile

@@ -38,6 +38,9 @@ RUN mkdir /var/sfm && chmod ugo+w /var/sfm
 VOLUME /var/sfm
 ADD invoke.sh /opt/
 RUN chmod +x /opt/invoke.sh
+#Forward request and error logs to docker log collector
+RUN ln -sf /dev/stdout /var/log/apache2/access.log
+RUN ln -sf /dev/stderr /var/log/apache2/error.log
 WORKDIR /opt/sfm-ui
 CMD ["/opt/invoke.sh"]
 ENV DJANGO_SETTINGS_MODULE=sfm.settings.docker_settings

docs/development.rst

@@ -113,11 +113,8 @@ the SFM UI application is called ui and is controlled by the `SFM_UI_LOG` enviro
 
 Apache logs
 ^^^^^^^^^^^
-SFM UI runs behind Apache, which means Apache collects stdout and stderr in `/var/log/apache2/error.log`.
-
-The contents of error.log can be viewed with::
-
-    docker exec <name of your container> cat /var/log/apache2/error.log
+In the SFM UI container, Apache logs are sent to stdout/stderr which means they can be viewed with
+`docker-compose logs` or `docker logs <container name or id>`.
 
 Initial data
 ^^^^^^^^^^^^