openstack
/
glance
Code Issues Proposed changes

Merge "Disable osprofiler by default"

This commit is contained in:
Jenkins 2014-11-28 20:35:15 +00:00 committed by Gerrit Code Review
parent a006d671c0 090cb56ba1
commit f82574fa68
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/glance-api.conf
View File

@ -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 ============================

4
etc/glance-registry.conf
View File

@ -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

4
glance/common/wsgi.py
View File

@ -88,9 +88,9 @@ eventlet_opts = [
]
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."))
]

12
glance/tests/unit/common/test_config.py
View File

@ -97,3 +97,15 @@ class TestPasteApp(test_utils.BaseTestCase):
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)