-#!/usr/bin/python
-# -*- encoding: utf-8 -*-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# $Id$
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
#----------------------------------------------------------
# python imports
#----------------------------------------------------------
-import sys, os, signal
-#----------------------------------------------------------
-# ubuntu 8.04 has obsoleted `pyxml` package and installs here.
-# the path needs to be updated before any `import xml`
-# TODO: remove PyXML dependencies, use lxml instead.
-#----------------------------------------------------------
-_oldxml = '/usr/lib/python%s/site-packages/oldxml' % sys.version[:3]
-if os.path.exists(_oldxml):
- sys.path.append(_oldxml)
-
+import sys
+import os
+import signal
+import pwd
import release
__author__ = release.author
__version__ = release.version
+# We DON't log this using the standard logger, because we might mess
+# with the logfile's permissions. Just do a quick exit here.
+if pwd.getpwuid(os.getuid())[0] == 'root' :
+ sys.stderr.write("Attempted to run OpenERP server as root. This is not good, aborting.\n")
+ sys.exit(1)
+
#----------------------------------------------------------
# get logger
#----------------------------------------------------------
logger.notifyChannel("server", netsvc.LOG_INFO, "version - %s" % release.version )
for name, value in [('addons_path', tools.config['addons_path']),
- ('database hostname', tools.config['db_host'] or 'localhost')]:
+ ('database hostname', tools.config['db_host'] or 'localhost'),
+ ('database port', tools.config['db_port'] or '5432'),
+ ('database user', tools.config['db_user'])]:
logger.notifyChannel("server", netsvc.LOG_INFO, "%s - %s" % ( name, value ))
import time
-if sys.platform == 'win32':
- import mx.DateTime
- mx.DateTime.strptime = lambda x, y: mx.DateTime.mktime(time.strptime(x, y))
-
#----------------------------------------------------------
# init net service
#----------------------------------------------------------
logger.notifyChannel("objects", netsvc.LOG_INFO, 'initialising distributed objects services')
-dispatcher = netsvc.Dispatcher()
-dispatcher.monitor(signal.SIGINT)
-
#---------------------------------------------------------------
# connect to the database and initialize it with base if needed
#---------------------------------------------------------------
import pooler
#----------------------------------------------------------
-# launch modules install/upgrade/removes if needed
-#----------------------------------------------------------
-if tools.config['upgrade']:
- logger.notifyChannel('init', netsvc.LOG_INFO, 'Upgrading new modules...')
- import tools.upgrade
- (toinit, toupdate) = tools.upgrade.upgrade()
- for m in toinit:
- tools.config['init'][m] = 1
- for m in toupdate:
- tools.config['update'][m] = 1
-
-#----------------------------------------------------------
# import basic modules
#----------------------------------------------------------
import osv
# Load and update databases if requested
#----------------------------------------------------------
+import service.http_server
+
+if not ( tools.config["stop_after_init"] or \
+ tools.config["translate_in"] or \
+ tools.config["translate_out"] ):
+ service.http_server.init_servers()
+ service.http_server.init_xmlrpc()
+
+ import service.netrpc_server
+ service.netrpc_server.init_servers()
+
if tools.config['db_name']:
for db in tools.config['db_name'].split(','):
pooler.get_db_and_pool(db, update_module=tools.config['init'] or tools.config['update'])
msg = "language %s" % (tools.config["language"],)
else:
msg = "new language"
- logger.notifyChannel("init", netsvc.LOG_INFO, 'writing translation file for %s to %s' % (msg, tools.config["translate_out"]))
+ logger.notifyChannel("init", netsvc.LOG_INFO,
+ 'writing translation file for %s to %s' % (msg,
+ tools.config["translate_out"]))
fileformat = os.path.splitext(tools.config["translate_out"])[-1][1:].lower()
buf = file(tools.config["translate_out"], "w")
tools.trans_export(tools.config["language"], tools.config["translate_modules"], buf, fileformat)
buf.close()
- logger.notifyChannel("init", netsvc.LOG_INFO, 'translation file written succesfully')
+ logger.notifyChannel("init", netsvc.LOG_INFO, 'translation file written successfully')
sys.exit(0)
if tools.config["translate_in"]:
- tools.trans_load(tools.config["db_name"], tools.config["translate_in"], tools.config["language"])
+ tools.trans_load(tools.config["db_name"],
+ tools.config["translate_in"],
+ tools.config["language"])
sys.exit(0)
#----------------------------------------------------------------------------------
#----------------------------------------------------------
-# Launch Server
+# Launch Servers
#----------------------------------------------------------
-if tools.config['xmlrpc']:
- try:
- port = int(tools.config["port"])
- except Exception:
- logger.notifyChannel("init", netsvc.LOG_ERROR, "invalid port '%s'!" % (tools.config["port"],))
- sys.exit(1)
- interface = tools.config["interface"]
- secure = tools.config["secure"]
-
- httpd = netsvc.HttpDaemon(interface, port, secure)
+LST_SIGNALS = ['SIGINT', 'SIGTERM']
+if os.name == 'posix':
+ LST_SIGNALS.extend(['SIGUSR1','SIGQUIT'])
- if tools.config["xmlrpc"]:
- xml_gw = netsvc.xmlrpc.RpcGateway('web-services')
- httpd.attach("/xmlrpc", xml_gw)
- logger.notifyChannel("web-services", netsvc.LOG_INFO, "starting XML-RPC%s services, port %s" % ((tools.config['secure'] and ' Secure' or ''), port))
-
-#
-#if tools.config["soap"]:
-# soap_gw = netsvc.xmlrpc.RpcGateway('web-services')
-# httpd.attach("/soap", soap_gw )
-# logger.notifyChannel("web-services", netsvc.LOG_INFO, 'starting SOAP services, port '+str(port))
-#
-if tools.config['netrpc']:
- try:
- netport = int(tools.config["netport"])
- except Exception:
- logger.notifyChannel("init", netsvc.LOG_ERROR, "invalid port '%s'!" % (tools.config["netport"],))
- sys.exit(1)
- netinterface = tools.config["netinterface"]
+SIGNALS = dict(
+ [(getattr(signal, sign), sign) for sign in LST_SIGNALS]
+)
- tinySocket = netsvc.TinySocketServerThread(netinterface, netport, False)
- logger.notifyChannel("web-services", netsvc.LOG_INFO, "starting NET-RPC service, port "+str(netport))
-
-
-def handler(signum, frame):
- from tools import config
- if tools.config['netrpc']:
- tinySocket.stop()
- if tools.config['xmlrpc']:
- httpd.stop()
+def handler(signum, _):
+ """
+ :param signum: the signal number
+ :param _:
+ """
netsvc.Agent.quit()
- if config['pidfile']:
- os.unlink(config['pidfile'])
+ netsvc.Server.quitAll()
+ if tools.config['pidfile']:
+ os.unlink(tools.config['pidfile'])
+ logger.notifyChannel('shutdown', netsvc.LOG_INFO,
+ "Shutdown Server! - %s" % ( SIGNALS[signum], ))
+ logger.shutdown()
sys.exit(0)
-from tools import config
-if config['pidfile']:
- fd = open(config['pidfile'], 'w')
+for signum in SIGNALS:
+ signal.signal(signum, handler)
+
+if tools.config['pidfile']:
+ fd = open(tools.config['pidfile'], 'w')
pidtext = "%d" % (os.getpid())
fd.write(pidtext)
fd.close()
-signal.signal(signal.SIGINT, handler)
-signal.signal(signal.SIGTERM, handler)
-logger.notifyChannel("web-services", netsvc.LOG_INFO, 'the server is running, waiting for connections...')
-if tools.config['netrpc']:
- tinySocket.start()
-if tools.config['xmlrpc']:
- httpd.start()
-#dispatcher.run()
+netsvc.Server.startAll()
+
+logger.notifyChannel("web-services", netsvc.LOG_INFO,
+ 'the server is running, waiting for connections...')
while True:
- time.sleep(1)
+ time.sleep(60)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-