diff options
| author | Adam Young <ayoung@redhat.com> | 2012-09-28 17:58:26 -0400 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2012-09-28 20:27:59 -0400 |
| commit | fecf7f3c210a7d08a53dc8c3bcf0f0b79cf01fe7 (patch) | |
| tree | 99d5d99cde23547d8f9685dcf58b797e95885b2d | |
| parent | 433edcfbf72602ec4e7bf0ad996cdb2fb31305ba (diff) | |
Command line switch for standard threads.
Whitespace cleanup
Pep 8 line length fix
Bug 1039112
Change-Id: Ib11a6817f999802d90764404a5efbde33ce6e9eb
| -rwxr-xr-x | bin/keystone-all | 5 | ||||
| -rw-r--r-- | keystone/config.py | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index ee09ee16..8867f455 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -18,7 +18,6 @@ if os.path.exists(os.path.join(possible_topdir, '__init__.py')): sys.path.insert(0, possible_topdir) -eventlet.patcher.monkey_patch(all=False, socket=True, time=True, thread=True) from paste import deploy @@ -91,6 +90,10 @@ if __name__ == '__main__': CONF.print_help() sys.exit(1) + monkeypatch_thread = not CONF._cli_values['standard_threads'] + eventlet.patcher.monkey_patch(all=False, socket=True, time=True, + thread=monkeypatch_thread) + options = deploy.appconfig('config:%s' % CONF.config_file[0]) servers = [] diff --git a/keystone/config.py b/keystone/config.py index 5fed916c..b2e9c1ea 100644 --- a/keystone/config.py +++ b/keystone/config.py @@ -117,6 +117,7 @@ register_str('admin_port', default=35357) register_str('public_port', default=5000) register_str('onready') register_str('auth_admin_prefix', default='') +register_bool('standard-threads', default=False) #ssl options register_bool('enable', group='ssl', default=False) |