From a133bb28cdb55de5d3e622e65e45cabf304386bb Mon Sep 17 00:00:00 2001
From: ShyPike <shypike@sabnzbd.org>
Date: Wed, 22 Feb 2012 22:01:06 +0100
Subject: [PATCH] Add loglevel -1 to suppress logging altogether.

---
 SABnzbd.py     | 14 +++++++-------
 sabnzbd/cfg.py |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SABnzbd.py b/SABnzbd.py
index 036acd8..d67d485 100755
--- a/SABnzbd.py
+++ b/SABnzbd.py
@@ -231,7 +231,7 @@ def print_help():
     print "  -t  --templates <templ>  Template directory [*]"
     print "  -2  --template2 <templ>  Secondary template dir [*]"
     print
-    print "  -l  --logging <0..2>     Set logging level (0= least, 2= most) [*]"
+    print "  -l  --logging <0..2>     Set logging level (-1=off, 0= least, 2= most) [*]"
     print "  -w  --weblogging <0..2>  Set cherrypy logging (0= off, 1= on, 2= file-only) [*]"
     print
     print "  -b  --browser <0..1>     Auto browser launch (0= off, 1= on) [*]"
@@ -941,8 +941,8 @@ def main():
             try:
                 logging_level = int(arg)
             except:
-                logging_level = -1
-            if logging_level < 0 or logging_level > 2:
+                logging_level = -2
+            if logging_level < -1 or logging_level > 2:
                 print_help()
                 exit_sab(1)
         elif opt in ('-v', '--version'):
@@ -1000,7 +1000,7 @@ def main():
     if noConsoleLoggingOSX:
         consoleLogging = 1
 
-    LOGLEVELS = (logging.WARNING, logging.INFO, logging.DEBUG)
+    LOGLEVELS = (logging.FATAL, logging.WARNING, logging.INFO, logging.DEBUG)
 
     # Setup primary logging to prevent default console logging
     gui_log = guiHandler(MAX_WARNINGS)
@@ -1185,7 +1185,7 @@ def main():
         rollover_log.addFilter(FilterCP3())
         sabnzbd.LOGHANDLER = rollover_log
         logger.addHandler(rollover_log)
-        logger.setLevel(LOGLEVELS[logging_level])
+        logger.setLevel(LOGLEVELS[logging_level+1])
 
     except IOError:
         print "Error:"
@@ -1213,7 +1213,7 @@ def main():
             if consoleLogging:
                 console = logging.StreamHandler()
                 console.addFilter(FilterCP3())
-                console.setLevel(LOGLEVELS[logging_level])
+                console.setLevel(LOGLEVELS[logging_level+1])
                 console.setFormatter(logging.Formatter(format))
                 logger.addHandler(console)
             if noConsoleLoggingOSX:
@@ -1535,7 +1535,7 @@ def main():
         # Check for loglevel changes
         if LOG_FLAG:
             LOG_FLAG = False
-            level = LOGLEVELS[sabnzbd.cfg.log_level()]
+            level = LOGLEVELS[sabnzbd.cfg.log_level()+1]
             logger.setLevel(level)
             if consoleLogging:
                 console.setLevel(level)
diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
index 49f0498..a9643bb 100644
--- a/sabnzbd/cfg.py
+++ b/sabnzbd/cfg.py
@@ -194,7 +194,7 @@ warned_old_queue = OptionBool('misc', 'warned_old_queue', False)
 
 log_web = OptionBool('logging', 'enable_cherrypy_logging', False)
 log_dir = OptionDir('misc', 'log_dir', 'logs', validation=validate_notempty)
-log_level = OptionNumber('logging', 'log_level', 1, 0, 2)
+log_level = OptionNumber('logging', 'log_level', 1, -1, 2)
 log_size = OptionStr('logging', 'max_log_size', '5242880')
 log_backups = OptionNumber('logging', 'log_backups', 5, 1, 1024)
 log_new = OptionBool('logging', 'log_new', False)