Refactor config parsing

1 files changed, 5 insertions, 6 deletions

diff --git a/market.py b/market.py
index 10d1ad8..e16641c 100644
--- a/market.py
+++ b/market.py
@@ -25,11 +25,10 @@ class Market:
         self.balances = BalanceStore(self)
         self.processor = Processor(self)
 
-        for key in ["user_id", "market_id", "report_path", "pg_config"]:
+        for key in ["user_id", "market_id", "pg_config"]:
             setattr(self, key, kwargs.get(key, None))
 
-        self.report.log_market(self.args, self.user_id, self.market_id,
-                self.report_path, self.debug)
+        self.report.log_market(self.args, self.user_id, self.market_id)
 
     @classmethod
     def from_config(cls, config, args, **kwargs):
@@ -42,14 +41,14 @@ class Market:
     def store_report(self):
         self.report.merge(Portfolio.report)
         date = datetime.now()
-        if self.report_path is not None:
+        if self.args.report_path is not None:
             self.store_file_report(date)
-        if self.pg_config is not None:
+        if self.pg_config is not None and self.args.report_db:
             self.store_database_report(date)
 
     def store_file_report(self, date):
         try:
-            report_file = "{}/{}_{}".format(self.report_path, date.isoformat(), self.user_id)
+            report_file = "{}/{}_{}".format(self.args.report_path, date.isoformat(), self.user_id)
             with open(report_file + ".json", "w") as f:
                 f.write(self.report.to_json())
             with open(report_file + ".log", "w") as f: