Initialize services before databases.
This will let modules register into services properly. bzr revid: p_christ@hol.gr-20090903210647-6xs4cco3pl9fo3o4
This commit is contained in:
parent
643b76682a
commit
77cf69258c
|
@ -112,6 +112,14 @@ import addons
|
||||||
# Load and update databases if requested
|
# Load and update databases if requested
|
||||||
#----------------------------------------------------------
|
#----------------------------------------------------------
|
||||||
|
|
||||||
|
import service.http_server
|
||||||
|
|
||||||
|
service.http_server.init_servers()
|
||||||
|
service.http_server.init_xmlrpc()
|
||||||
|
|
||||||
|
import service.netrpc_server
|
||||||
|
service.netrpc_server.init_servers()
|
||||||
|
|
||||||
if tools.config['db_name']:
|
if tools.config['db_name']:
|
||||||
for db in tools.config['db_name'].split(','):
|
for db in tools.config['db_name'].split(','):
|
||||||
pooler.get_db_and_pool(db, update_module=tools.config['init'] or tools.config['update'])
|
pooler.get_db_and_pool(db, update_module=tools.config['init'] or tools.config['update'])
|
||||||
|
@ -155,14 +163,6 @@ if tools.config["stop_after_init"]:
|
||||||
# Launch Servers
|
# Launch Servers
|
||||||
#----------------------------------------------------------
|
#----------------------------------------------------------
|
||||||
|
|
||||||
import service.http_server
|
|
||||||
|
|
||||||
service.http_server.init_servers()
|
|
||||||
service.http_server.init_xmlrpc()
|
|
||||||
|
|
||||||
import service.netrpc_server
|
|
||||||
service.netrpc_server.init_servers()
|
|
||||||
|
|
||||||
LST_SIGNALS = ['SIGINT', 'SIGTERM']
|
LST_SIGNALS = ['SIGINT', 'SIGTERM']
|
||||||
if os.name == 'posix':
|
if os.name == 'posix':
|
||||||
LST_SIGNALS.extend(['SIGUSR1','SIGQUIT'])
|
LST_SIGNALS.extend(['SIGUSR1','SIGQUIT'])
|
||||||
|
|
Loading…
Reference in New Issue