Merge branch 'updated-scripts' into 'dev'

Updated scripts

See merge request !43

.gitlab-ci.yml

@@ -32,12 +32,13 @@ deploy_test:
   script:
     - echo "deploying test"
     - cp ./nginx_snippets/* /etc/nginx/snippets/
+    - mkdir -p /var/log/strudel2
     - docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io
     - docker stop strudel2_backend || echo "Failed to stop existing container"
     - docker ps -a -q | xargs -I{} docker rm  {} || echo "No containers to remove"
     - docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
     - docker pull l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
-    - docker run --mount type=bind,source=/messages,target=/messages -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
+    - docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always  -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
   dependencies:
     - build
 
@@ -52,12 +53,13 @@ deploy_dev:
   script:
     - echo "deploying dev"
     - cp ./nginx_snippets/* /etc/nginx/snippets/
+    - mkdir -p /var/log/strudel2
     - docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io
     - docker stop strudel2_backend || echo "Failed to stop existing container"
     - docker ps -a -q | xargs -I{} docker rm  {} || echo "No containers to remove"
     - docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
     - docker pull l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
-    - docker run --mount type=bind,source=/messages,target=/messages -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
+    - docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always  -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
   dependencies:
     - build
     
@@ -72,12 +74,13 @@ deploy_prod:
   script:
     - echo "deploying prod"
     - cp ./nginx_snippets/* /etc/nginx/snippets/
+    - mkdir -p /var/log/strudel2
     - docker login -u $DOCKERHUBUSER -p $DOCKERHUBPASSWORD docker.io
     - docker stop strudel2_backend || echo "Failed to stop existing container"
     - docker ps -a -q | xargs -I{} docker rm  {} || echo "No containers to remove"
     - docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
     - docker pull l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
-    - docker run --mount type=bind,source=/messages,target=/messages -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
+    - docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always  -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
   dependencies:
     - build
     

tes/tes_wsgi.py

 import logging
-logging.basicConfig(filename="/var/log/tes.log",format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
+logging.basicConfig(filename="/var/log/strudel2/tes.log",format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
 logger=logging.getLogger()
 logger.setLevel(logging.DEBUG)
 import argparse

twsproxy/__init__.py

@@ -168,7 +168,7 @@ def mainserver(port=None):
     import sys
     import os
     try:
-        logging.basicConfig(filename="/var/log/tws.log",format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
+        logging.basicConfig(filename="/var/log/strudel2/tws.log",format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
     except:
         logging.basicConfig(filename=os.path.expanduser("~/.tws.log"),format="%(asctime)s %(levelname)s:%(process)s: %(message)s")
     logger = logging.getLogger()