openstack/swift
Code Issues Proposed changes

Move call to global_conf_callback after loadapp()

Browse Source 
Otherwise, paste complains about not being able to interpolate values
into the replication_semaphore. As long as it gets dropped in before we
fork(), I think it's OK?

Closes-Bug: 1691075
Change-Id: Ib7e065c47871876786bcc9ff39737f5d1bb3c12c
This commit is contained in:
Tim Burke 2019-06-14 16:20:03 -07:00
parent 9f1ef35630
commit ff4459ed6b
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/wsgi.py
View File

@ -1048,9 +1048,9 @@ def run_wsgi(conf_path, app_section, *args, **kwargs):
# Ensure the configuration and application can be loaded before proceeding. # Ensure the configuration and application can be loaded before proceeding.
global_conf = {'log_name': log_name} global_conf = {'log_name': log_name}
loadapp(conf_path, global_conf=global_conf)
if 'global_conf_callback' in kwargs: if 'global_conf_callback' in kwargs:
kwargs['global_conf_callback'](conf, global_conf) kwargs['global_conf_callback'](conf, global_conf)
loadapp(conf_path, global_conf=global_conf)
# set utils.FALLOCATE_RESERVE if desired # set utils.FALLOCATE_RESERVE if desired
utils.FALLOCATE_RESERVE, utils.FALLOCATE_IS_PERCENT = \ utils.FALLOCATE_RESERVE, utils.FALLOCATE_IS_PERCENT = \

19
test/unit/common/test_wsgi.py
View File

@ -780,25 +780,34 @@ class TestWSGI(unittest.TestCase):
'logger', 'logger',
'log_name') 'log_name')
loadapp_conf = []
to_inject = object() # replication_timeout injects non-string data
def _global_conf_callback(preloaded_app_conf, global_conf): def _global_conf_callback(preloaded_app_conf, global_conf):
calls['_global_conf_callback'] += 1 calls['_global_conf_callback'] += 1
self.assertEqual( self.assertEqual(
preloaded_app_conf, {'__file__': 'test', 'workers': 0}) preloaded_app_conf, {'__file__': 'test', 'workers': 0})
self.assertEqual(global_conf, {'log_name': 'log_name'}) self.assertEqual(global_conf, {'log_name': 'log_name'})
global_conf['test1'] = 'one' global_conf['test1'] = to_inject
def _loadapp(uri, name=None, **kwargs): def _loadapp(uri, name=None, **kwargs):
calls['_loadapp'] += 1 calls['_loadapp'] += 1
self.assertTrue('global_conf' in kwargs) self.assertIn('global_conf', kwargs)
self.assertEqual(kwargs['global_conf'], loadapp_conf.append(kwargs['global_conf'])
{'log_name': 'log_name', 'test1': 'one'}) # global_conf_callback hasn't been called yet
self.assertNotIn('test1', kwargs['global_conf'])
def _run_server(*args, **kwargs):
# but by the time that we actually *run* the server, it has
self.assertEqual(loadapp_conf,
[{'log_name': 'log_name', 'test1': to_inject}])
with mock.patch.object(wsgi, '_initrp', _initrp), \ with mock.patch.object(wsgi, '_initrp', _initrp), \
mock.patch.object(wsgi, 'get_socket'), \ mock.patch.object(wsgi, 'get_socket'), \
mock.patch.object(wsgi, 'drop_privileges'), \ mock.patch.object(wsgi, 'drop_privileges'), \
mock.patch.object(wsgi, 'loadapp', _loadapp), \ mock.patch.object(wsgi, 'loadapp', _loadapp), \
mock.patch.object(wsgi, 'capture_stdio'), \ mock.patch.object(wsgi, 'capture_stdio'), \
mock.patch.object(wsgi, 'run_server'), \ mock.patch.object(wsgi, 'run_server', _run_server), \
mock.patch('swift.common.utils.eventlet') as _utils_evt: mock.patch('swift.common.utils.eventlet') as _utils_evt:
wsgi.run_wsgi('conf_file', 'app_section', wsgi.run_wsgi('conf_file', 'app_section',
global_conf_callback=_global_conf_callback) global_conf_callback=_global_conf_callback)