Merge branch 'log-file-location-change'

dexbot/__init__.py

@@ -1,4 +1,4 @@
 APP_NAME = 'dexbot'
-VERSION = '0.4.6'
+VERSION = '0.4.7'
 AUTHOR = 'Codaone Oy'
 __version__ = VERSION

dexbot/controllers/main_controller.py

@@ -1,11 +1,13 @@
+import os
 import logging
 import sys
 
-from dexbot import VERSION
+from dexbot import VERSION, APP_NAME, AUTHOR
 from dexbot.helper import initialize_orders_log
 from dexbot.worker import WorkerInfrastructure
 from dexbot.views.errors import PyQtHandler
 
+from appdirs import user_data_dir
 from bitshares.instance import set_shared_bitshares_instance
 
 
@@ -18,10 +20,12 @@ def __init__(self, bitshares_instance, config):
         self.worker_manager = None
 
         # Configure logging
+        data_dir = user_data_dir(APP_NAME, AUTHOR)
+        filename = os.path.join(data_dir, 'dexbot.log')
         formatter = logging.Formatter(
             '%(asctime)s - %(worker_name)s using account %(account)s on %(market)s - %(levelname)s - %(message)s')
         logger = logging.getLogger("dexbot.per_worker")
-        fh = logging.FileHandler('dexbot.log')
+        fh = logging.FileHandler(filename)
         fh.setFormatter(formatter)
         logger.addHandler(fh)
         logger.setLevel(logging.INFO)

dexbot/helper.py

@@ -36,7 +36,7 @@ def initialize_orders_log():
     """ Creates .csv log file, adds the headers first time only
     """
     data_dir = user_data_dir(APP_NAME, AUTHOR)
-    filename = os.path.join(data_dir, 'orders.csv')
+    filename = os.path.join(data_dir, 'history.csv')
     file = os.path.isfile(filename)
 
     formatter = logging.Formatter('%(message)s')