Merge pull request #15 from seatable/fix-logrotate

fix log rotate
seatable · Dec 2, 2021 · 3eb6050 · 3eb6050
2 parents 72422a1 + 580020c
commit 3eb6050
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -8,6 +8,9 @@ COPY scripts/my-ubuntu-source.list /etc/apt/sources.list
 ## Dev related libs
 RUN apt-get update --fix-missing
 
+# Time zone
+RUN export DEBIAN_FRONTEND=noninteractive && apt-get install -y tzdata
+
 # Nginx
 RUN apt-get install -y nginx
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -17,6 +17,7 @@ services:
     environment:
       - SEATABLE_THUMBNAIL_SERVER_HOSTNAME=thumbnail.seatable.cn
       - SEATABLE_THUMBNAIL_SERVER_LETSENCRYPT=True
+      - TIME_ZONE=Asia/Shanghai
     depends_on:
       - redis
     networks:

diff --git a/docker/scripts/01_init.sh b/docker/scripts/01_init.sh
@@ -2,6 +2,18 @@
 
 set -e
 
+# time zone
+if [[ $TIME_ZONE != "" ]]; then
+    time_zone=/usr/share/zoneinfo/$TIME_ZONE
+    if [[ ! -e $time_zone ]]; then
+        echo "invalid time zone"
+        exit 1
+    else
+        ln -snf $time_zone /etc/localtime
+        echo "$TIME_ZONE" > /etc/timezone
+    fi
+fi
+
 # check folder
 if [[ ! -e /shared ]]; then
     echo 'do not find /shared path'

diff --git a/docker/scripts/enterpoint.sh b/docker/scripts/enterpoint.sh
@@ -53,8 +53,12 @@ fi
 
 
 # logrotate
-chmod 0644 /scripts/logrotate-conf/logrotate-cron
-/usr/bin/crontab /scripts/logrotate-conf/logrotate-cron
+if [[ -f /var/spool/cron/crontabs/root ]]; then
+    cat /scripts/logrotate-conf/logrotate-cron >> /var/spool/cron/crontabs/root
+else
+    chmod 0644 /scripts/logrotate-conf/logrotate-cron
+    /usr/bin/crontab /scripts/logrotate-conf/logrotate-cron
+fi
 
 
 # autorun

diff --git a/docker/scripts/logrotate-conf/seatable-thumbnail b/docker/scripts/logrotate-conf/seatable-thumbnail
@@ -12,6 +12,10 @@
         create 644 root root
         sharedscripts
         postrotate
+                if [ -f /opt/seatable-thumbnail/pids/seafile.pid ]; then
+                        kill -USR1 `cat /opt/seatable-thumbnail/pids/seafile.pid`
+                fi
+
                 /scripts/logrotate-conf/seatable-thumbnail-restart.sh
         endscript
 }
diff --git a/docker/scripts/logrotate-conf/seatable-thumbnail-restart.sh b/docker/scripts/logrotate-conf/seatable-thumbnail-restart.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 function stop_server() {
-    pkill -9 -f seaf-server
     pkill -9 -f uvicorn
     pkill -9 -f multiprocessing
 }
@@ -25,9 +24,6 @@ function start_server() {
 
     set_env
 
-    seaf-server -F /opt/seatable-thumbnail/conf -c /opt/seatable-thumbnail/ccnet -d /opt/seatable-thumbnail/seafile-data -l /opt/seatable-thumbnail/logs/seafile.log -L /opt/seatable-thumbnail -P /opt/seatable-thumbnail/pids/seafile.pid - &
-    sleep 0.2
-
     cd /opt/seatable-thumbnail/seatable-thumbnail-server/
     /usr/local/bin/uvicorn main:app --host 127.0.0.1 --port 8088 --workers 4 --access-log --proxy-headers &>> /opt/seatable-thumbnail/logs/seatable-thumbnail.log &
     sleep 0.2