2 files changed, 7 insertions, 2 deletions
diff --git a/python/task_server/__main__.py b/python/task_server/__main__.py
index cd5b6f29..450dae56 100644
--- a/python/task_server/__main__.py
+++ b/python/task_server/__main__.py
@@ -1,10 +1,11 @@
 import logging
 import argparse
 import datetime
+import os
 from .globeop import download_data, upload_data
 from sqlalchemy import create_engine
 
-logging.basicConfig(filename='/home/serenitas/CorpCDOs/logs/globeop.log',
+logging.basicConfig(filename=os.path.join(os.getenv("LOG_DIR"), 'globeop.log'),
                     level=logging.INFO,
                     format='%(asctime)s %(message)s')
 
diff --git a/python/task_server/globeop.py b/python/task_server/globeop.py
index 03750ca4..1bb3c9cb 100644
--- a/python/task_server/globeop.py
+++ b/python/task_server/globeop.py
@@ -43,7 +43,11 @@ def key_fun(s):
     return (PED, KD)
 
 def run_date(s):
-    return pd.datetime.strptime(s.split("_")[2], "%Y%m%d.%H%M%S")
+    if 'SWO' in 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")
 
 def get_ftp(folder):
     ftp = FTP('ftp.globeop.com')