Merge "Disable osprofiler by default"

openstack · Nov 28, 2014 · f82574f · f82574f
2 parents a006d67 + 090cb56
commit f82574f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/etc/glance-api.conf b/etc/glance-api.conf
@@ -413,10 +413,10 @@ revocation_cache_time = 10
 
 [profiler]
 # If False fully disable profiling feature.
-#enabled = True
+#enabled = False
 
 # If False doesn't trace SQL requests.
-#trace_sqlalchemy = True
+#trace_sqlalchemy = False
 
 [task]
 # ================= Glance Tasks Options ============================

diff --git a/etc/glance-registry.conf b/etc/glance-registry.conf
@@ -238,7 +238,7 @@ admin_password = %SERVICE_PASSWORD%
 
 [profiler]
 # If False fully disable profiling feature.
-#enabled = True
+#enabled = False
 
 # If False doesn't trace SQL requests.
-#trace_sqlalchemy = True
+#trace_sqlalchemy = False
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
@@ -88,9 +88,9 @@
 ]
 
 profiler_opts = [
-    cfg.BoolOpt("enabled", default=True,
+    cfg.BoolOpt("enabled", default=False,
                 help=_('If False fully disable profiling feature.')),
-    cfg.BoolOpt("trace_sqlalchemy", default=True,
+    cfg.BoolOpt("trace_sqlalchemy", default=False,
                 help=_("If False doesn't trace SQL requests."))
 ]
 

diff --git a/glance/tests/unit/common/test_config.py b/glance/tests/unit/common/test_config.py
@@ -97,3 +97,15 @@ def test_load_paste_app_with_paste_config_file(self):
 
     def test_get_path_non_exist(self):
         self.assertRaises(RuntimeError, config._get_deployment_config_file)
+
+
+class TestDefaultConfig(test_utils.BaseTestCase):
+
+    def setUp(self):
+        super(TestDefaultConfig, self).setUp()
+        self.CONF = config.cfg.CONF
+        self.CONF.import_group('profiler', 'glance.common.wsgi')
+
+    def test_osprofiler_disabled(self):
+        self.assertFalse(self.CONF.profiler.enabled)
+        self.assertFalse(self.CONF.profiler.trace_sqlalchemy)