From edf18a65fe94aaf88630ed7d9afcd74bfc16af8b Mon Sep 17 00:00:00 2001
From: Sid Doshi <scdoshi@gmail.com>
Date: Thu, 9 Jul 2015 12:57:53 -0700
Subject: [PATCH 1/2] accept log level param on cactus cli

---
 cactus/cli.py    | 8 +++++---
 cactus/logger.py | 9 +++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/cactus/cli.py b/cactus/cli.py
index 2616dd75..bb887530 100755
--- a/cactus/cli.py
+++ b/cactus/cli.py
@@ -2,7 +2,6 @@
 # encoding: utf-8
 import os
 import sys
-import logging
 import time
 import argparse
 import colorama
@@ -104,6 +103,9 @@ def main():
         subparser.add_argument('-c', '--config', action="append",
                                help='Add a config file you want to use')
 
+        subparser.add_argument('--log-level', dest='loglevel',
+                               help='Set log level')
+
         subparser.set_defaults(path = os.getcwd())
 
     args = parser.parse_args()
@@ -113,9 +115,9 @@ def main():
     if hasattr(args, 'config') and args.config is None:  # We don't need config for create
         args.config = ["config.json"]
 
-    setup_logging()
+    setup_logging(getattr(args, 'loglevel'))
 
-    args.target(**{k: v for k, v in vars(args).items() if k != 'target'})
+    args.target(**{k: v for k, v in vars(args).items() if k not in ['target', 'loglevel']})
 
 
 if __name__ == "__main__":
diff --git a/cactus/logger.py b/cactus/logger.py
index 68fe4c23..39d0dc2c 100644
--- a/cactus/logger.py
+++ b/cactus/logger.py
@@ -20,23 +20,20 @@ def format(self, record):
 
         return json.dumps(data)
 
-def setup_logging():
+def setup_logging(level='INFO'):
 
     logger = logging.getLogger()
     handler = logging.StreamHandler()
+    log_level = logging.getLevelName(level)
 
     if os.environ.get('DESKTOPAPP'):
-        log_level = logging.INFO
         log_format = '%(message)s'
 
         handler.setFormatter(JsonFormatter())
 
     else:
-
         from colorlog import ColoredFormatter
-        
-        log_level = logging.INFO
-        
+
         formatter = ColoredFormatter(
             "%(log_color)s%(message)s",
             datefmt=None,

From bbca3f89e73615fbe560f9019e1f25ae8871223d Mon Sep 17 00:00:00 2001
From: Sid Doshi <scdoshi@gmail.com>
Date: Thu, 9 Jul 2015 18:05:32 -0700
Subject: [PATCH 2/2] defaults when no log-level specified

---
 cactus/logger.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cactus/logger.py b/cactus/logger.py
index 39d0dc2c..6eea59d0 100644
--- a/cactus/logger.py
+++ b/cactus/logger.py
@@ -20,10 +20,13 @@ def format(self, record):
 
         return json.dumps(data)
 
-def setup_logging(level='INFO'):
+def setup_logging(level):
 
     logger = logging.getLogger()
     handler = logging.StreamHandler()
+
+    if not level:
+        level = 'INFO'
     log_level = logging.getLevelName(level)
 
     if os.environ.get('DESKTOPAPP'):