openstack/congress
Code Issues Proposed changes

Merge "move config init from congress_servers.py to bin/congress-server"

Browse Source
This commit is contained in:
Zuul 2019-02-08 05:45:02 +00:00 committed by Gerrit Code Review
commit bd56734f83
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/congress-server
View File

@ -15,7 +15,6 @@
# under the License.
#
import os
import sys
@ -29,6 +28,9 @@ if os.path.exists(os.path.join(possible_topdir,
'__init__.py')):
sys.path.insert(0, possible_topdir)
# set command line config options
from congress.common import config
config.init(sys.argv[1:])
from congress.server import congress_server

13
congress/server/congress_server.py
View File

@ -26,16 +26,8 @@ from oslo_log import log as logging
from oslo_service import service
from congress.common import config
from congress.db import api as db_api
# FIXME It has to initialize distributed_architecture flag basing on the
# config file before the python interpreter imports python file which has
# if-statement for deepsix. Since the default value of the flag is False
# in current implementation, so it will import dse.deepsix as deepsix
# even if you set it to True in congress.conf.
# After changing the default to True, remove following one line.
# This appears in main() too. Removing either instance breaks something.
config.init(sys.argv[1:])
from congress.common import eventlet_server
from congress.db import api as db_api
from congress import encryption
from congress import harness
@ -136,7 +128,8 @@ def main():
# TODO(thinrichs): find the right way to do deployment configuration.
# For some reason we need to config.init(args) in 2 places; here and
# at the top of the file. Remove either one, and things break.
# at the top of the file (now moved to bin/congress-server).
# Remove either one, and things break.
# Note: config.init() will delete the deploy args, so grab them before.
config.init(args)
if not cfg.CONF.config_file: