FIxed double logging

Author: MultiFox200

src/Dockerfile

@@ -11,4 +11,4 @@ WORKDIR /scheduler/
 
 COPY . .
 
-CMD python scheduler.py
+ENTRYPOINT [ "python", "scheduler.py" ]

src/dump.py

@@ -1,15 +1,14 @@
 import os
 import gzip
 import boto3
-import logging.config
+import logging
 from datetime import datetime
 
 from clickhouse_driver import Client as ClickhouseClient
 
 from slack import send_slack_message, sizeof_fmt
 
 
-logging.config.fileConfig('logging.ini')
 logger = logging.getLogger('ddgscheduler')
 
 

src/logging.ini

@@ -1,5 +1,5 @@
 [loggers]
-keys=root,ddgscheduler
+keys=root
 
 [handlers]
 keys=consoleHandler
@@ -11,11 +11,6 @@ keys=consoleFormatter
 level=INFO
 handlers=consoleHandler
 
-[logger_ddgscheduler]
-level=DEBUG
-handlers=consoleHandler
-qualname=ddgscheduler
-
 [handler_consoleHandler]
 class=StreamHandler
 formatter=consoleFormatter

src/scheduler.py

@@ -1,14 +1,15 @@
 import logging.config
 
+logging.config.fileConfig('logging.ini')
+
 from apscheduler.triggers.cron import CronTrigger
-from apscheduler.schedulers.background import BackgroundScheduler
+from apscheduler.schedulers.background import BackgroundScheduler, BlockingScheduler
 
 from env import get_env
 from server import AuthServer
 from dump import dump_database
 from slack import send_slack_message
 
-logging.config.fileConfig('logging.ini')
 logger = logging.getLogger('ddgscheduler')
 
 
@@ -21,7 +22,11 @@
         dump_database(environment)
         time.sleep(300)
     else:
-        dumper_scheduler = BackgroundScheduler()
+        if environment.get('START_MANUAL_MANAGEMENT_SERVER'):
+            dumper_scheduler = BackgroundScheduler()
+        else:
+            dumper_scheduler = BlockingScheduler()
+
         dumper_scheduler.add_job(lambda: dump_database(environment), CronTrigger.from_crontab(environment.get('CRON')))
         dumper_scheduler.start()
 

src/slack.py

@@ -1,7 +1,6 @@
-import logging.config
+import logging
 from slack_sdk.webhook import WebhookClient
 
-logging.config.fileConfig('logging.ini')
 logger = logging.getLogger('ddgscheduler')