Merge branch 'master' of https://github.com/digitalmethodsinitiative/…

…4cat

4cat-daemon.py

@@ -126,7 +126,7 @@ def start():
         with daemon.DaemonContext(
                 working_directory=os.path.abspath(os.path.dirname(__file__)),
                 umask=0x002,
-                stderr=open("4cat.stderr", "w+"),
+                stderr=open(Path(config.get('PATH_ROOT'), config.get('PATH_LOGS'), "4cat.stderr"), "w+"),
                 detach_process=True
         ) as context:
             import backend.bootstrap as bootstrap

backend/bootstrap.py

@@ -47,8 +47,9 @@ def run(as_daemon=True):
 
 	# load everything
 	if config.get("USING_DOCKER"):
+		as_daemon = True
 		# Rename log if Docker setup
-		log = Logger(output=not as_daemon, filename='backend_4cat.log')
+		log = Logger(output=True, filename='backend_4cat.log')
 	else:
 		log = Logger(output=not as_daemon)
 

docker-compose.yml

@@ -16,6 +16,7 @@ services:
   backend:
     image: digitalmethodsinitiative/4cat:${DOCKER_TAG}
     container_name: 4cat_backend
+    init: true
     restart: unless-stopped
     env_file:
       - .env

docker-compose_build.yml

@@ -18,6 +18,7 @@ services:
       context: .
       dockerfile: docker/Dockerfile
     container_name: 4cat_backend
+    init: true
     env_file:
       - .env
     depends_on:

docker-compose_public_ip.yml

@@ -24,6 +24,7 @@ services:
   backend:
     image: digitalmethodsinitiative/4cat:${DOCKER_TAG}
     container_name: 4cat_backend
+    init: true
     restart: unless-stopped
     env_file:
       - .env

docker/docker-entrypoint.sh

@@ -1,14 +1,6 @@
 #!/bin/sh
 set -e
 
-exit_backend() {
-  echo "Exiting backend"
-  python3 4cat-daemon.py stop
-  exit 0
-}
-
-trap exit_backend INT TERM
-
 # Handle any options
 while test $# != 0
 do
@@ -56,9 +48,4 @@ echo "http://$SERVER_NAME:$PUBLIC_PORT"
 echo ''
 
 # Start 4CAT backend
-python3 4cat-daemon.py start
-
-# Hang out until SIGTERM received
-while true; do
-    sleep 1
-done
+exec python3 -u 4cat-daemon.py -i start

setup.py

@@ -44,6 +44,7 @@
 	"PyTumblr==0.1.0",
 	"requests~=2.27",
 	"requests_futures",
+	"scikit-learn",
 	"scenedetect==0.6.0.3",
 	"spacy==3.4.3",
 	"svgwrite~=1.4.0",