#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+# Copyright (C) 2010-2012 OpenERP SA (<http://www.openerp.com>)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
import logging
import os
import signal
+import subprocess
import sys
import threading
import time
-import netrpc_server
+import cron
import web_services
+import web_services
+import wsgi_server
-import openerp.cron
import openerp.modules
import openerp.netsvc
import openerp.osv
+from openerp.release import nt_service_name
import openerp.tools
-import openerp.service.wsgi_server
#.apidoc title: RPC Services
_logger.exception('Failed to load server-wide module `%s`.%s', m, msg)
start_internal_done = False
+main_thread_id = threading.currentThread().ident
def start_internal():
global start_internal_done
return
openerp.netsvc.init_logger()
openerp.modules.loading.open_openerp_namespace()
- # Instantiate local services (this is a legacy design).
- openerp.osv.osv.start_object_proxy()
+
# Export (for RPC) services.
- web_services.start_web_services()
+ web_services.start_service()
+
load_server_wide_modules()
start_internal_done = True
def start_services():
- """ Start all services including http, netrpc and cron """
+ """ Start all services including http, and cron """
start_internal()
-
- # Initialize the HTTP stack.
- netrpc_server.init_servers()
-
- # Start the main cron thread.
- if openerp.conf.max_cron_threads:
- openerp.cron.start_master_thread()
-
- # Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC).
- openerp.netsvc.Server.startAll()
-
# Start the WSGI server.
- openerp.service.wsgi_server.start_server()
+ wsgi_server.start_service()
+ # Start the main cron thread.
+ cron.start_service()
def stop_services():
""" Stop all services. """
- # stop scheduling new jobs; we will have to wait for the jobs to complete below
- openerp.cron.cancel_all()
+ # stop services
+ cron.stop_service()
+ wsgi_server.stop_service()
- openerp.netsvc.Server.quitAll()
- openerp.service.wsgi_server.stop_server()
_logger.info("Initiating shutdown")
_logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
_logger.debug('current thread: %r', me)
for thread in threading.enumerate():
_logger.debug('process %r (%r)', thread, thread.isDaemon())
- if thread != me and not thread.isDaemon():
+ if thread != me and not thread.isDaemon() and thread.ident != main_thread_id:
while thread.isAlive():
_logger.debug('join and sleep')
# Need a busyloop here as thread.join() masks signals
def _reexec():
"""reexecute openerp-server process with (nearly) the same arguments"""
- # TODO check if parent is a NT service
+ if openerp.tools.osutil.is_running_as_nt_service():
+ subprocess.call('net stop {0} && net start {0}'.format(nt_service_name), shell=True)
+ exe = os.path.basename(sys.executable)
strip_args = ['-d', '-u']
a = sys.argv[:]
args = [x for i, x in enumerate(a) if x not in strip_args and a[max(i - 1, 0)] not in strip_args]
- os.execv(sys.executable, [sys.executable] + args)
+ if not args or args[0] != exe:
+ args.insert(0, exe)
+ os.execv(sys.executable, args)
def restart_server():
if openerp.multi_process: