Merge #870: Don't create logs, wallets and cmtdata subdirectories under scripts

25b2e8e6f4 Don't create logs, wallets and cmtdata subdirectories under scripts (Kristaps Kaupe)

Pull request description:

  Leftover from #475. These empty directories may confuse users.

Top commit has no ACKs.

Tree-SHA512: fafe30639a4b14a95b15bf947011ca6b8ca54a69576e133efc51dbcb530abfabd9df4affc081eda196954e331a337f263444d858474df3153775920c33873eb2

jmclient/jmclient/configure.py

@@ -28,8 +28,6 @@ class AttributeDict(object):
     def __init__(self, **entries):
         self.currentnick = None
         self.add_entries(**entries)
-        if not os.path.exists('logs'):
-            os.makedirs('logs')
 
     def add_entries(self, **entries):
         for key, value in entries.items():
@@ -45,7 +43,7 @@ class AttributeDict(object):
                 ('%(asctime)s [%(threadName)-12.12s] '
                  '[%(levelname)-5.5s]  %(message)s'))
             logsdir = os.path.join(os.path.dirname(
-            global_singleton.config_location), "logs")
+                global_singleton.config_location), "logs")
             fileHandler = logging.FileHandler(
                 logsdir + '/{}.log'.format(value))
             fileHandler.setFormatter(logFormatter)
@@ -512,7 +510,7 @@ class JMPluginService(object):
             ('%(asctime)s [%(levelname)-5.5s] {} - %(message)s'.format(
                 self.name)))
         fileHandler = logging.FileHandler(
-        self.logdirname + '/{}'.format(self.logfilename))
+            self.logdirname + '/{}'.format(self.logfilename))
         fileHandler.setFormatter(logFormatter)
         get_log().addHandler(fileHandler)
 
@@ -660,7 +658,7 @@ def load_program_config(config_path="", bs=None, plugin_services=[]):
             # itself will switch on its own logging when ready,
             # attaching a filehandler to the global log.
             plogsdir = os.path.join(os.path.dirname(
-            global_singleton.config_location), "logs", p.name)
+                global_singleton.config_location), "logs", p.name)
             if not os.path.exists(plogsdir):
                 os.makedirs(plogsdir)
             p.set_log_dir(plogsdir)

scripts/cmtdata/.gitignore

@@ -1,4 +0,0 @@
-# Ignore all 
-*
-# Except this file
-!.gitignore

scripts/joinmarket-qt.py

@@ -2190,10 +2190,6 @@ if isinstance(jm_single().bc_interface, RegtestBitcoinCoreInterface):
     #trigger start with a fake tx
     jm_single().bc_interface.pushtx(b"\x00"*20)
 
-#prepare for logging
-for dname in ['logs', 'wallets', 'cmtdata']:
-    if not os.path.exists(dname):
-        os.makedirs(dname)
 logsdir = os.path.join(os.path.dirname(jm_single().config_location), "logs")
 #tumble log will not always be used, but is made available anyway:
 tumble_log = get_tumble_log(logsdir)