From 4c352485619d86c08ba41671e2aa4681d1f92ab9 Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Tue, 1 Apr 2014 21:57:22 -0700
Subject: [PATCH] Changed nzbtomedia_configure_logging to accept a logfile
 paramater so that in the future if wanted we could log to seperate files

---
 TorrentToMedia.py             | 2 +-
 autoProcess/nzbToMediaUtil.py | 4 ++--
 nzbToCouchPotato.py           | 2 +-
 nzbToGamez.py                 | 2 +-
 nzbToHeadPhones.py            | 2 +-
 nzbToMedia.py                 | 4 ++--
 nzbToMylar.py                 | 2 +-
 nzbToSickBeard.py             | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 6d969fe1..3b91515d 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -436,7 +436,7 @@ if __name__ == "__main__":
         migratecfg.migrate()
     
     # Logging
-    nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
+    nzbtomedia_configure_logging(LOG_FILE)
     Logger = logging.getLogger(__name__)
 
     Logger.info("====================") # Seperate old from new log
diff --git a/autoProcess/nzbToMediaUtil.py b/autoProcess/nzbToMediaUtil.py
index df51b484..15704431 100644
--- a/autoProcess/nzbToMediaUtil.py
+++ b/autoProcess/nzbToMediaUtil.py
@@ -28,9 +28,9 @@ def safeName(name):
     return safename
 
 
-def nzbtomedia_configure_logging(dirname):
+def nzbtomedia_configure_logging(logfile):
     logging.config.fileConfig(CONFIG_FILE)
-    fileHandler = logging.handlers.RotatingFileHandler(LOG_FILE, mode='a', maxBytes=1048576, backupCount=1, encoding='utf-8', delay=True)
+    fileHandler = logging.handlers.RotatingFileHandler(logfile, mode='a', maxBytes=1048576, backupCount=1, encoding='utf-8', delay=True)
     fileHandler.formatter = logging.Formatter('%(asctime)s|%(levelname)-7.7s %(message)s', '%H:%M:%S')
     fileHandler.level = logging.DEBUG
     logging.getLogger().addHandler(fileHandler)
diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py
index 81a50beb..728ffdfe 100755
--- a/nzbToCouchPotato.py
+++ b/nzbToCouchPotato.py
@@ -135,7 +135,7 @@ if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.c
 if os.environ.has_key('NZBOP_SCRIPTDIR'):
     migratecfg.addnzbget()
 
-nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
+nzbtomedia_configure_logging(LOG_FILE)
 Logger = logging.getLogger(__name__)
 
 Logger.info("====================") # Seperate old from new log
diff --git a/nzbToGamez.py b/nzbToGamez.py
index cbfdcfa6..42791970 100755
--- a/nzbToGamez.py
+++ b/nzbToGamez.py
@@ -71,7 +71,7 @@ if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.c
 if os.environ.has_key('NZBOP_SCRIPTDIR'):
     migratecfg.addnzbget()
 
-nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
+nzbtomedia_configure_logging(LOG_FILE)
 Logger = logging.getLogger(__name__)
 
 Logger.info("====================") # Seperate old from new log
diff --git a/nzbToHeadPhones.py b/nzbToHeadPhones.py
index e5edab40..ca0f9b82 100755
--- a/nzbToHeadPhones.py
+++ b/nzbToHeadPhones.py
@@ -81,7 +81,7 @@ if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.c
 if os.environ.has_key('NZBOP_SCRIPTDIR'):
     migratecfg.addnzbget()
 
-nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
+nzbtomedia_configure_logging(LOG_FILE)
 Logger = logging.getLogger(__name__)
 
 Logger.info("====================") # Seperate old from new log
diff --git a/nzbToMedia.py b/nzbToMedia.py
index 538145f6..8161a8b8 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -297,10 +297,10 @@ elif config():
     migratecfg.migrate()
 
 # check to write settings from nzbGet UI to autoProcessMedia.cfg.
-if os.environ.has_key('NZBOP_SCRIPTDIR'):
+if config() and os.environ.has_key('NZBOP_SCRIPTDIR'):
     migratecfg.addnzbget()
 
-nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
+nzbtomedia_configure_logging(LOG_FILE)
 Logger = logging.getLogger(__name__)
 
 Logger.info("====================") # Seperate old from new log
diff --git a/nzbToMylar.py b/nzbToMylar.py
index a22e6df7..0d470235 100755
--- a/nzbToMylar.py
+++ b/nzbToMylar.py
@@ -74,7 +74,7 @@ if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.c
 if os.environ.has_key('NZBOP_SCRIPTDIR'):
     migratecfg.addnzbget()
 
-nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
+nzbtomedia_configure_logging(LOG_FILE)
 Logger = logging.getLogger(__name__)
 
 Logger.info("====================") # Seperate old from new log
diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py
index b330abe1..bf32077a 100755
--- a/nzbToSickBeard.py
+++ b/nzbToSickBeard.py
@@ -138,7 +138,7 @@ if os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.c
 if os.environ.has_key('NZBOP_SCRIPTDIR'):
     migratecfg.addnzbget()
 
-nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
+nzbtomedia_configure_logging(LOG_FILE)
 Logger = logging.getLogger(__name__)
 
 Logger.info("====================") # Seperate old from new log