Merge "Disable osprofiler by default"
This commit is contained in:
commit
f82574fa68
|
@ -413,10 +413,10 @@ revocation_cache_time = 10
|
||||||
|
|
||||||
[profiler]
|
[profiler]
|
||||||
# If False fully disable profiling feature.
|
# If False fully disable profiling feature.
|
||||||
#enabled = True
|
#enabled = False
|
||||||
|
|
||||||
# If False doesn't trace SQL requests.
|
# If False doesn't trace SQL requests.
|
||||||
#trace_sqlalchemy = True
|
#trace_sqlalchemy = False
|
||||||
|
|
||||||
[task]
|
[task]
|
||||||
# ================= Glance Tasks Options ============================
|
# ================= Glance Tasks Options ============================
|
||||||
|
|
|
@ -238,7 +238,7 @@ admin_password = %SERVICE_PASSWORD%
|
||||||
|
|
||||||
[profiler]
|
[profiler]
|
||||||
# If False fully disable profiling feature.
|
# If False fully disable profiling feature.
|
||||||
#enabled = True
|
#enabled = False
|
||||||
|
|
||||||
# If False doesn't trace SQL requests.
|
# If False doesn't trace SQL requests.
|
||||||
#trace_sqlalchemy = True
|
#trace_sqlalchemy = False
|
||||||
|
|
|
@ -88,9 +88,9 @@ eventlet_opts = [
|
||||||
]
|
]
|
||||||
|
|
||||||
profiler_opts = [
|
profiler_opts = [
|
||||||
cfg.BoolOpt("enabled", default=True,
|
cfg.BoolOpt("enabled", default=False,
|
||||||
help=_('If False fully disable profiling feature.')),
|
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."))
|
help=_("If False doesn't trace SQL requests."))
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -97,3 +97,15 @@ class TestPasteApp(test_utils.BaseTestCase):
|
||||||
|
|
||||||
def test_get_path_non_exist(self):
|
def test_get_path_non_exist(self):
|
||||||
self.assertRaises(RuntimeError, config._get_deployment_config_file)
|
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)
|
||||||
|
|
Loading…
Reference in New Issue