5 files changed, 7 insertions, 10 deletions
diff --git a/python/task_server/README.md b/python/task_server/README.md
index 4e895b68..a6e2be53 100644
--- a/python/task_server/README.md
+++ b/python/task_server/README.md
@@ -2,4 +2,4 @@ Config is set through environment variables:
 
  - DAILY_DIR
  - LOG_DIR
-
+ - BASE_DIR
diff --git a/python/task_server/__init__.py b/python/task_server/__init__.py
index 2a2d1dad..63d44dd4 100644
--- a/python/task_server/__init__.py
+++ b/python/task_server/__init__.py
@@ -4,7 +4,7 @@ import task_server.rest
 import logging
 import os
 
-fh = logging.FileHandler(filename=os.path.join(os.getenv("LOG_DIR"), 'tasks.log'))
+fh = logging.FileHandler(filename=os.path.join(os.environ["LOG_DIR"], 'tasks.log'))
 formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 fh.setFormatter(formatter)
 
diff --git a/python/task_server/__main__.py b/python/task_server/__main__.py
index 450dae56..72754733 100644
--- a/python/task_server/__main__.py
+++ b/python/task_server/__main__.py
@@ -5,7 +5,7 @@ import os
 from .globeop import download_data, upload_data
 from sqlalchemy import create_engine
 
-logging.basicConfig(filename=os.path.join(os.getenv("LOG_DIR"), 'globeop.log'),
+logging.basicConfig(filename=os.path.join(os.environ["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 908035a6..8d4334e9 100644
--- a/python/task_server/globeop.py
+++ b/python/task_server/globeop.py
@@ -17,8 +17,6 @@ try:
 except ImportError:
     pass
 
-root = os.getenv("DAILY_DIR")
-
 def get_ped(s):
     regex = re.search("PED=([^.]+)", s)
     if regex:
@@ -82,7 +80,7 @@ def download_data(workdate):
         logger.error("no file available for date: %s" % str(workdate))
         return
 
-    reports_dir = os.path.join(root, str(workdate), "Reports")
+    reports_dir = os.path.join(os.environ['DAILY_DIR'], str(workdate), "Reports")
     if not os.path.exists(reports_dir):
         os.makedirs(reports_dir)
 
@@ -115,7 +113,7 @@ def upload_bond_marks(engine, workdate):
     df.rename(columns = {'identifier': 'IDENTIFIER',
                          'price': 'Price'}, inplace=True)
     filename = 'securitiesNpv{0:%Y%m%d_%H%M%S}.csv'.format(workdate)
-    fullpath = os.path.join(root, str(workdate.date()), filename)
+    fullpath = os.path.join(os.environ['DAILY_DIR'], str(workdate.date()), filename)
     df.to_csv(fullpath, index=False)
     ftp = get_ftp('incoming')
     with open(fullpath, "rb") as fh:
@@ -127,7 +125,7 @@ def upload_cds_marks(engine, workdate):
 (a.clean_nav+a.accrued)  AS "NPV" from list_abscds_marks(%s) a
 JOIN cds USING (security_id)""", engine, params = (workdate.date(),))
     filename = 'otcNpv{0:%Y%m%d}.csv'.format(workdate)
-    fullpath = os.path.join(root, str(workdate.date()), filename)
+    fullpath = os.path.join(os.environ['DAILY_DIR'], str(workdate.date()), filename)
     df.to_csv(fullpath, index=False)
     ftp = get_ftp('incoming')
     with open(fullpath, "rb") as fh:
diff --git a/python/task_server/insert_tranche_quotes.py b/python/task_server/insert_tranche_quotes.py
index 02d93190..f16d76c6 100644
--- a/python/task_server/insert_tranche_quotes.py
+++ b/python/task_server/insert_tranche_quotes.py
@@ -36,8 +36,7 @@ runningdict2 = {0: 500, 3:500, 7:500, 10:100, 15:100, 30:100}
 
 def insert_quotes(year=2016, quote_dir=None):
     if not quote_dir:
-        root_dir = '/home/serenitas/CorpCDOs'
-        quote_dir = os.path.join(root_dir, 'Tranche_data', 'Quotes')
+        quote_dir = os.path.join(os.environ['BASE_DIR'], 'Tranche_data', 'Quotes')
     quotefiles = [f for f in os.listdir(quote_dir) if f.endswith('csv')]
     for quotefile in quotefiles:
         with open(os.path.join(quote_dir, quotefile)) as fh: