summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-02-21 23:17:59 +0100
committermathieui <mathieui@mathieui.net>2015-02-21 23:17:59 +0100
commit4fd222a493f7bc31bd442151266c680807be06f6 (patch)
tree12cfe77f45bdfa25aea33bc719c6c150cd53392a
parent1209bd94b60cb85c756d937ad9cada69f2428397 (diff)
downloadpoezio-4fd222a493f7bc31bd442151266c680807be06f6.tar.gz
poezio-4fd222a493f7bc31bd442151266c680807be06f6.tar.bz2
poezio-4fd222a493f7bc31bd442151266c680807be06f6.tar.xz
poezio-4fd222a493f7bc31bd442151266c680807be06f6.zip
Remove the unused "logfile" option and do not append 'logs' to every log path
-rw-r--r--src/config.py3
-rw-r--r--src/logger.py4
2 files changed, 2 insertions, 5 deletions
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 '