diff options
| -rw-r--r-- | python/task_server/__init__.py | 2 | ||||
| -rw-r--r-- | python/task_server/globeop.py | 10 | ||||
| -rw-r--r-- | python/task_server/insert_tranche_quotes.py | 16 |
3 files changed, 18 insertions, 10 deletions
diff --git a/python/task_server/__init__.py b/python/task_server/__init__.py index c05d8c27..6e1fba1f 100644 --- a/python/task_server/__init__.py +++ b/python/task_server/__init__.py @@ -7,7 +7,7 @@ fh = logging.FileHandler(filename='/home/share/CorpCDOs/logs/tasks.log') fh.setLevel(logging.INFO) formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') fh.setFormatter(formatter) -loggers = [logging.getLogger('intex'), app.logger] +loggers = [logging.getLogger('intex'), app.logger, logging.getLogger(__name__)] app.logger.setLevel(logging.INFO) for logger in loggers: logger.addHandler(fh) diff --git a/python/task_server/globeop.py b/python/task_server/globeop.py index e123933f..6676c721 100644 --- a/python/task_server/globeop.py +++ b/python/task_server/globeop.py @@ -2,13 +2,15 @@ import os import os.path
from ftplib import FTP
import gnupg
-from . import config
+from task_server import config
import re
import logging
import shutil
import pandas as pd
from sqlalchemy import create_engine
+logger = logging.getLogger(__name__)
+
try:
import pandas as pd
from pandas.tseries.offsets import BDay
@@ -77,7 +79,7 @@ def download_data(workdate): available_files.append(sorted(cdsfiles, key=run_date, reverse=True)[0])
if not available_files:
- logging.error("no file available for date: %s" % str(workdate))
+ logger.error("no file available for date: %s" % str(workdate))
return
reports_dir = os.path.join(root, str(workdate), "Reports")
@@ -87,7 +89,7 @@ def download_data(workdate): for filename in available_files:
with open(os.path.join(reports_dir, filename), "wb") as fh:
ftp.retrbinary('RETR ' + filename, fh.write)
- logging.info("downloaded {0}".format(filename))
+ logger.info("downloaded {0}".format(filename))
gpg = get_gpg()
for filename in available_files:
@@ -116,4 +118,4 @@ def upload_data(engine, workdate): ftp = get_ftp('incoming')
with open(fullpath, "rb") as fh:
ftp.storbinary('STOR ' + filename, fh)
- logging.info("upload done")
+ logger.info("upload done")
diff --git a/python/task_server/insert_tranche_quotes.py b/python/task_server/insert_tranche_quotes.py index 251d60bf..632304bd 100644 --- a/python/task_server/insert_tranche_quotes.py +++ b/python/task_server/insert_tranche_quotes.py @@ -5,6 +5,8 @@ import csv import datetime
import logging
+logger = logging.getLogger(__name__)
+
engine = create_engine('postgresql://serenitas_user@debian/serenitasdb')
metadata = MetaData(bind = engine)
quotes = Table('tranche_quotes', metadata, autoload = True)
@@ -30,11 +32,15 @@ def insert_quotes(year=2015, quote_dir=None): reader = csv.DictReader(fh)
data = []
for csvdict in reader:
- try:
- timestamp = datetime.datetime.strptime(csvdict['Date'], "%d %b %Y %H:%M")
- except ValueError:
- logging.error("%s: Date in the wrong format", csvdict['Date'])
- return
+ for p in ["%d %b %Y %H:%M", "%m/%d/%Y %H:%M"]:
+ try:
+ timestamp = datetime.datetime.strptime(csvdict['Date'], p)
+ break
+ except ValueError:
+ logger.error("%s: Date in the wrong format", csvdict['Date'])
+ continue
+ else:
+ logger.error("%s: Date in the wrong format", csvdict['Date'])
attach = int(csvdict['Attach'])
series = int(csvdict['Series'])
|