3 files changed, 12 insertions, 18 deletions
diff --git a/python/task_server/__init__.py b/python/task_server/__init__.py
index e37fff73..244f6f34 100644
--- a/python/task_server/__init__.py
+++ b/python/task_server/__init__.py
@@ -1,17 +1,13 @@
+from env import DAILY_DIR
 from flask import Flask
-from pathlib import Path
+from utils import SerenitasFileHandler
+
 app = Flask(__name__)
 import logging
-import os
-
-LOG_DIR = Path(os.environ["LOG_DIR"])
-DAILY_DIR = Path(os.environ["DAILY_DIR"])
 
-fh = logging.FileHandler(filename=LOG_DIR / 'tasks.log')
-formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-fh.setFormatter(formatter)
 
-loggers = [logging.getLogger('intex'), app.logger, logging.getLogger(__name__)]
+fh = SerenitasFileHandler("tasks.log")
+loggers = [logging.getLogger("intex"), app.logger, logging.getLogger(__name__)]
 
 for logger in loggers:
     logger.setLevel(logging.INFO)
diff --git a/python/task_server/__main__.py b/python/task_server/__main__.py
index ed6b8c1e..c0ffa89c 100644
--- a/python/task_server/__main__.py
+++ b/python/task_server/__main__.py
@@ -4,12 +4,12 @@ import datetime
 from . import LOG_DIR
 from .globeop import download_data, upload_data
 from sqlalchemy import create_engine
+from utils import SerenitasFileHandler
 
-logging.basicConfig(
-    filename=LOG_DIR / "globeop.log",
-    level=logging.INFO,
-    format="%(asctime)s %(message)s",
-)
+fh = SerenitasFileHandler("globeop.log")
+logger = logging.getLogger("globeop")
+logger.addHandler(fh)
+logger.setLevel(logging.INFO)
 
 parser = argparse.ArgumentParser()
 group = parser.add_mutually_exclusive_group(required=True)
diff --git a/python/task_server/globeop.py b/python/task_server/globeop.py
index 15d8f33c..52ac249a 100644
--- a/python/task_server/globeop.py
+++ b/python/task_server/globeop.py
@@ -49,7 +49,7 @@ def run_date(s):
         date_string = s.split("_", 5)[4]
     else:
         date_string = s.split("_", 3)[2]
-    return pd.datetime.strptime(date_string, "%Y%m%d.%H%M%S")
+    return datetime.datetime.strptime(date_string, "%Y%m%d.%H%M%S")
 
 
 def get_ftp(folder):
@@ -182,9 +182,7 @@ def upload_bond_marks(engine, workdate: datetime.date):
         params=(workdate, workdate),
     )
     df.rename(columns={"identifier": "IDENTIFIER", "price": "Price"}, inplace=True)
-    fullpath = (
-        DAILY_DIR / str(workdate) / f"securitiesNpv{workdate:%Y%m%d_%H%M%S}.csv"
-    )
+    fullpath = DAILY_DIR / str(workdate) / f"securitiesNpv{workdate:%Y%m%d_%H%M%S}.csv"
     df.to_csv(fullpath, index=False)
     ftp = get_ftp("incoming")
     with fullpath.open("rb") as fh: