From 630c2fa21ed53b8af1bb9b41bb9bd4597e4f7d95 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 13 Nov 2012 10:55:17 -0500
Subject: [PATCH] Make jasmine testing quieter

---
 cms/envs/jasmine.py       |  4 +++-
 common/lib/logsettings.py | 11 ++++++++---
 lms/envs/jasmine.py       |  4 +++-
 rakefile                  |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/cms/envs/jasmine.py b/cms/envs/jasmine.py
index b29e170411..5c9be1cf9c 100644
--- a/cms/envs/jasmine.py
+++ b/cms/envs/jasmine.py
@@ -12,7 +12,9 @@ LOGGING = get_logger_config(TEST_ROOT / "log",
                             logging_env="dev",
                             tracking_filename="tracking.log",
                             dev_env=True,
-                            debug=True)
+                            debug=True,
+                            local_loglevel='ERROR',
+                            console_loglevel='ERROR')
 
 PIPELINE_JS['js-test-source'] = {
     'source_filenames': sum([
diff --git a/common/lib/logsettings.py b/common/lib/logsettings.py
index 2b001b0517..1e96534128 100644
--- a/common/lib/logsettings.py
+++ b/common/lib/logsettings.py
@@ -3,6 +3,7 @@ import platform
 import sys
 from logging.handlers import SysLogHandler
 
+LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']
 
 def get_logger_config(log_dir,
                       logging_env="no_env",
@@ -11,7 +12,8 @@ def get_logger_config(log_dir,
                       dev_env=False,
                       syslog_addr=None,
                       debug=False,
-                      local_loglevel='INFO'):
+                      local_loglevel='INFO',
+                      console_loglevel=None):
 
     """
 
@@ -30,9 +32,12 @@ def get_logger_config(log_dir,
     """
 
     # Revert to INFO if an invalid string is passed in
-    if local_loglevel not in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']:
+    if local_loglevel not in LOG_LEVELS:
         local_loglevel = 'INFO'
 
+    if console_loglevel is None or console_loglevel not in LOG_LEVELS:
+        console_loglevel = 'DEBUG' if debug else 'INFO'
+
     hostname = platform.node().split(".")[0]
     syslog_format = ("[%(name)s][env:{logging_env}] %(levelname)s "
                      "[{hostname}  %(process)d] [%(filename)s:%(lineno)d] "
@@ -55,7 +60,7 @@ def get_logger_config(log_dir,
         },
         'handlers': {
             'console': {
-                'level': 'DEBUG' if debug else 'INFO',
+                'level': console_loglevel,
                 'class': 'logging.StreamHandler',
                 'formatter': 'standard',
                 'stream': sys.stdout,
diff --git a/lms/envs/jasmine.py b/lms/envs/jasmine.py
index 317628f8ba..8551d80504 100644
--- a/lms/envs/jasmine.py
+++ b/lms/envs/jasmine.py
@@ -12,7 +12,9 @@ LOGGING = get_logger_config(TEST_ROOT / "log",
                             logging_env="dev",
                             tracking_filename="tracking.log",
                             dev_env=True,
-                            debug=True)
+                            debug=True,
+                            local_loglevel='ERROR',
+                            console_loglevel='ERROR')
 
 PIPELINE_JS['js-test-source'] = {
     'source_filenames': sum([
diff --git a/rakefile b/rakefile
index 4f1c15321f..5156c78147 100644
--- a/rakefile
+++ b/rakefile
@@ -47,7 +47,7 @@ def django_for_jasmine(system, django_reload)
     end
 
     django_pid = fork do
-        exec(*django_admin(system, 'jasmine', 'runserver', "12345", reload_arg).split(' '))
+        exec(*django_admin(system, 'jasmine', 'runserver', '-v', '0', "12345", reload_arg).split(' '))
     end
     jasmine_url = 'http://localhost:12345/_jasmine/'
     up = false