From 2d351c303a70adbeee22ff05f37727d9ed57a623 Mon Sep 17 00:00:00 2001
From: Berkona <berkona@gmail.com>
Date: Tue, 19 Feb 2013 22:33:45 -0500
Subject: [PATCH] Merged logger config

---
 autoProcessMedia.cfg.sample | 28 ++++++++++++++++++++++++++--
 logger.conf                 | 24 ------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 logger.conf

diff --git a/autoProcessMedia.cfg.sample b/autoProcessMedia.cfg.sample
index c92230f3..9be077da 100644
--- a/autoProcessMedia.cfg.sample
+++ b/autoProcessMedia.cfg.sample
@@ -1,8 +1,8 @@
 [CouchPotato]
 host = localhost
 port = 5050
-username = 
-password = 
+username =
+password =
 ssl = 0
 web_root =
 apikey = xxxxxxxx
@@ -28,3 +28,27 @@ destination = /abs/path/to/complete/tv
 uselink = 0
 extractiontool = 'C:\\Program Files\\7-Zip\\7z.exe'
 
+# Logging configuration
+[loggers]
+keys = root
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = NOTSET
+handlers = console
+qualname =
+
+[handler_console]
+class = StreamHandler
+args = (sys.stdout,)
+level = INFO
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s|%(levelname)-7.7s %(message)s
+datefmt = %H:%M:%S
diff --git a/logger.conf b/logger.conf
deleted file mode 100644
index 03f0b033..00000000
--- a/logger.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# Logging configuration
-[loggers]
-keys = root
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = NOTSET
-handlers = console
-qualname =
-
-[handler_console]
-class = StreamHandler
-args = (sys.stdout,)
-level = INFO
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s|%(levelname)-7.7s %(message)s
-datefmt = %H:%M:%S