Merge pull request #4066 from jamesachamp/3720/bug/manage-solr-logs

3720/bug/manage solr logs
internetarchive · Nov 20, 2020 · 8fcb4b8 · 8fcb4b8
2 parents e17c19c + 0fb4ff3
commit 8fcb4b8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/conf/solr/rmlog.sh b/conf/solr/rmlog.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find /var/log/tomcat7/* -mtime +7 -exec rm {} \;
diff --git a/conf/solr/start.sh b/conf/solr/start.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-
+# Start cron for log management
+cron start
 # Default to dev env
 ENV=${ENV:-dev}
 # How much memory to use

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -47,6 +47,10 @@ services:
       - solr-data:/var/lib/solr/data
     networks:
       - webnet
+    logging:
+      options:
+        max-size: "512m"
+        max-file: "4"
   memcached:
     image: memcached
     networks:

diff --git a/docker/Dockerfile.olsolr b/docker/Dockerfile.olsolr
@@ -1,13 +1,17 @@
 FROM ubuntu:xenial
 
 RUN apt-get -qq update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y solr-tomcat haproxy && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y solr-tomcat haproxy cron && \
     ln -s /var/log/tomcat7/ /usr/share/tomcat7/logs && \
     ln -s /etc/tomcat7/ /usr/share/tomcat7/conf
 
 COPY conf/solr/conf/* /etc/solr/conf/
 COPY conf/solr/haproxy.cfg /etc/haproxy/
 COPY conf/solr/start.sh /start.sh
 
+# Log management:
+COPY conf/solr/rmlog.sh /etc/cron.daily/rmlog
+RUN crontab /etc/crontab
+
 EXPOSE 8983
 CMD /start.sh