x/python-ganttclient
Code Issues Proposed changes

Switch from FLAGS to CONF in misc modules

Browse Source 
Use the global CONF variable instead of FLAGS. This is purely a cleanup
since FLAGS is already just another reference to CONF.

We leave the nova.flags imports until a later cleanup commit since
removing them may cause unpredictable problems due to config options not
being registered.

Change-Id: Ib110ba8d1837780e90b0d3fe13f8e6b68ed15f65
This commit is contained in:
Mark McLoughlin
2012-11-04 21:32:45 +00:00
parent d61df6e2f0
commit 510ebb0790
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/common/eventlet_backdoor.py
View File

@@ -25,6 +25,7 @@ import eventlet
import eventlet.backdoor import eventlet.backdoor
import greenlet import greenlet
from nova import config
from nova import flags from nova import flags
from nova.openstack.common import cfg from nova.openstack.common import cfg
@@ -34,8 +35,8 @@ eventlet_backdoor_opts = [
help='port for eventlet backdoor to listen') help='port for eventlet backdoor to listen')
] ]
FLAGS = flags.FLAGS CONF = config.CONF
FLAGS.register_opts(eventlet_backdoor_opts) CONF.register_opts(eventlet_backdoor_opts)
def dont_use_this(): def dont_use_this():
@@ -62,7 +63,7 @@ backdoor_locals = {
def initialize_if_enabled(): def initialize_if_enabled():
if FLAGS.backdoor_port is None: if CONF.backdoor_port is None:
return return
# NOTE(johannes): The standard sys.displayhook will print the value of # NOTE(johannes): The standard sys.displayhook will print the value of
@@ -76,5 +77,5 @@ def initialize_if_enabled():
sys.displayhook = displayhook sys.displayhook = displayhook
eventlet.spawn(eventlet.backdoor.backdoor_server, eventlet.spawn(eventlet.backdoor.backdoor_server,
eventlet.listen(('localhost', FLAGS.backdoor_port)), eventlet.listen(('localhost', CONF.backdoor_port)),
locals=backdoor_locals) locals=backdoor_locals)

11
nova/flags.py
View File

@@ -30,10 +30,11 @@ import os
import socket import socket
import sys import sys
from nova import config
from nova.openstack.common import cfg from nova.openstack.common import cfg
CONF = config.CONF
FLAGS = cfg.CONF FLAGS = CONF
def _get_my_ip(): def _get_my_ip():
@@ -88,8 +89,8 @@ debug_opts = [
help='Add python stack traces to SQL as comment strings'), help='Add python stack traces to SQL as comment strings'),
] ]
FLAGS.register_cli_opts(core_opts) CONF.register_cli_opts(core_opts)
FLAGS.register_cli_opts(debug_opts) CONF.register_cli_opts(debug_opts)
global_opts = [ global_opts = [
cfg.StrOpt('my_ip', cfg.StrOpt('my_ip',
@@ -376,4 +377,4 @@ global_opts = [
'vmwareapi.VMWareESXDriver'), 'vmwareapi.VMWareESXDriver'),
] ]
FLAGS.register_opts(global_opts) CONF.register_opts(global_opts)