From 4fd222a493f7bc31bd442151266c680807be06f6 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Sat, 21 Feb 2015 23:17:59 +0100
Subject: Remove the unused "logfile" option and do not append 'logs' to every
 log path

---
 src/config.py | 3 +--
 src/logger.py | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/config.py b/src/config.py
index 333809d2..3a693be8 100644
--- a/src/config.py
+++ b/src/config.py
@@ -78,7 +78,6 @@ DEFAULT_CONFIG = {
         'lazy_resize': True,
         'load_log': 10,
         'log_dir': '',
-        'logfile': 'logs',
         'log_errors': True,
         'max_lines_in_memory': 2048,
         'max_messages_in_memory': 2048,
@@ -590,7 +589,7 @@ def check_create_log_dir():
             home = environ.get('HOME')
             data_dir = path.join(home, '.local', 'share')
 
-        LOG_DIR = path.join(data_dir, 'poezio')
+        LOG_DIR = path.join(data_dir, 'poezio', 'logs')
 
     LOG_DIR = path.expanduser(LOG_DIR)
 
diff --git a/src/logger.py b/src/logger.py
index 85c7a746..1a46f5e5 100644
--- a/src/logger.py
+++ b/src/logger.py
@@ -25,9 +25,7 @@ import logging
 
 log = logging.getLogger(__name__)
 
-from config import LOG_DIR
-
-log_dir = os.path.join(LOG_DIR, 'logs')
+from config import LOG_DIR as log_dir
 
 message_log_re = re.compile(r'MR (\d{4})(\d{2})(\d{2})T'
                             r'(\d{2}):(\d{2}):(\d{2})Z '
-- 
cgit v1.2.3