From 8208c64df3966e43bca767edd634bd85da30554b Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Wed, 4 Jun 2014 00:03:29 -0700
Subject: [PATCH] Stop overriding CONF.default_log_levels per binary

Overriding CONF.default_log_levels means we loose some explicitly set
default values such as 'iso8601=WARN'. Also explicitly overriding
CONF.default_log_levels means that default_log_levels cannot be set in a
config file.

Change-Id: Ib5103b88ec3f9ccd9d516032c6a13dc2fa4bcb5e
---
 bin/heat-api            | 5 -----
 bin/heat-api-cfn        | 5 -----
 bin/heat-api-cloudwatch | 5 -----
 bin/heat-engine         | 6 ------
 4 files changed, 21 deletions(-)

diff --git a/bin/heat-api b/bin/heat-api
index 3dc7290d7c..cb5df9f5e8 100755
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -46,11 +46,6 @@ LOG = logging.getLogger('heat.api')
 if __name__ == '__main__':
     try:
         cfg.CONF(project='heat', prog='heat-api')
-        cfg.CONF.default_log_levels = ['amqplib=WARN',
-                                       'qpid.messaging=INFO',
-                                       'keystone=INFO',
-                                       'eventlet.wsgi.server=WARN',
-                                       ]
         logging.setup('heat')
 
         app = config.load_paste_app()
diff --git a/bin/heat-api-cfn b/bin/heat-api-cfn
index 06aba9b02a..1b793a5677 100755
--- a/bin/heat-api-cfn
+++ b/bin/heat-api-cfn
@@ -48,11 +48,6 @@ LOG = logging.getLogger('heat.api.cfn')
 if __name__ == '__main__':
     try:
         cfg.CONF(project='heat', prog='heat-api-cfn')
-        cfg.CONF.default_log_levels = ['amqplib=WARN',
-                                       'qpid.messaging=INFO',
-                                       'keystone=INFO',
-                                       'eventlet.wsgi.server=WARN',
-                                       ]
         logging.setup('heat')
 
         app = config.load_paste_app()
diff --git a/bin/heat-api-cloudwatch b/bin/heat-api-cloudwatch
index b6e1f142ec..701a96bed1 100755
--- a/bin/heat-api-cloudwatch
+++ b/bin/heat-api-cloudwatch
@@ -48,11 +48,6 @@ LOG = logging.getLogger('heat.api.cloudwatch')
 if __name__ == '__main__':
     try:
         cfg.CONF(project='heat', prog='heat-api-cloudwatch')
-        cfg.CONF.default_log_levels = ['amqplib=WARN',
-                                       'qpid.messaging=INFO',
-                                       'keystone=INFO',
-                                       'eventlet.wsgi.server=WARN',
-                                       ]
         logging.setup('heat')
 
         app = config.load_paste_app()
diff --git a/bin/heat-engine b/bin/heat-engine
index 88de2f27d5..1c6bdb2288 100755
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -48,12 +48,6 @@ LOG = logging.getLogger('heat.engine')
 if __name__ == '__main__':
 
     cfg.CONF(project='heat', prog='heat-engine')
-    cfg.CONF.default_log_levels = ['amqplib=WARN',
-                                   'sqlalchemy=WARN',
-                                   'qpid.messaging=INFO',
-                                   'keystone=INFO',
-                                   'eventlet.wsgi.server=WARN',
-                                   ]
     logging.setup('heat')
 
     from heat.engine import service as engine