From f32f3c7fa69b541ade5977e34e8c27c44b5fc3c3 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Fri, 13 Sep 2019 09:22:10 +0200
Subject: [PATCH] Use logging again
---
.gitignore | 7 ++++++-
config.py | 4 ----
docker-compose.yml | 3 +--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index fc445b7f..2b909d34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
+# Files
db.env
web.env
-__pycache__
+
+
+# Directories
logs
+migrations
+__pycache__
diff --git a/config.py b/config.py
index a938b370..1177ded2 100644
--- a/config.py
+++ b/config.py
@@ -36,7 +36,6 @@ class DevelopmentConfig(Config):
os.environ.get('POSTGRES_PASSWORD'),
os.environ.get('POSTGRES_DB_NAME')
)
- '''
if not os.path.isfile('logs/opaque_web.log'):
file_path = os.path.join(os.getcwd(), 'logs/opaque_web.log')
log = open(file_path, 'w+')
@@ -50,7 +49,6 @@ class DevelopmentConfig(Config):
logger = logging.getLogger(__name__)
logger.warning('Logging has started with level WARNING.'
' From development config.')
- '''
class TestingConfig(Config):
@@ -71,7 +69,6 @@ class ProductionConfig(Config):
os.environ.get('POSTGRES_PASSWORD'),
os.environ.get('POSTGRES_DB_NAME')
)
- '''
if not os.path.isfile('logs/opaque_web.log'):
file_path = os.path.join(os.getcwd(), 'logs/opaque_web.log')
log = open(file_path, 'w+')
@@ -85,7 +82,6 @@ class ProductionConfig(Config):
logger = logging.getLogger(__name__)
logger.error('Logging has started with level ERROR.'
' From production config.')
- '''
config = {
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ac0fa11..4b3040c1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,6 @@ services:
- ./app:/home/opaque/app
- ./config.py:/home/opaque/config.py
- ./logs:/home/opaque/logs
- - ./migrations:/home/opaque/migrations
- ./opaque.py:/home/opaque/opaque.py
daemon:
depends_on:
@@ -35,8 +34,8 @@ services:
image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest
volumes:
- ./logs:/home/opaque_daemon/logs
+ - ../opaque_daemon/opaque_daemon.py:/home/opaque_daemon/opaque_daemon.py
- $HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json
- - /home/stephan/Repos/own/opaque_daemon/opaque_daemon.py:/home/opaque_daemon/opaque_daemon.py
db:
deploy:
placement:
--
GitLab