summaryrefslogtreecommitdiff
path: root/openerp-server
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2011-09-13 15:10:42 +0200
committerOlivier Dony <odo@openerp.com>2011-09-13 15:10:42 +0200
commit8a2bc42c3c45b4d3c94070a29fa76636256f3da7 (patch)
treed64fbdb4ee6c67748a3e662a19b0be1271fbcbf6 /openerp-server
parentd8d3afa070a94c82dc16ad1d8321f1eb1ee3ae41 (diff)
[IMP] openerp-server: setup signal handlers earlier, spellcheck
bzr revid: odo@openerp.com-20110913131042-neaa6zwudwxwdded
Diffstat (limited to 'openerp-server')
-rwxr-xr-xopenerp-server5
1 files changed, 3 insertions, 2 deletions
diff --git a/openerp-server b/openerp-server
index dbae1c31884..9303ed68f73 100755
--- a/openerp-server
+++ b/openerp-server
@@ -215,7 +215,7 @@ def quit_on_signals():
os.unlink(config['pidfile'])
logger = logging.getLogger('server')
logger.info("Initiating shutdown")
- logger.info("Hit CTRL-C again or send a second signal to force the sutdown.")
+ logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
logging.shutdown()
# manually join() all threads before calling sys.exit() to allow a second signal
@@ -240,6 +240,8 @@ if __name__ == "__main__":
config = openerp.tools.config
+ setup_signal_handlers()
+
if config["test_file"]:
run_test_file(config['db_name'], config['test_file'])
sys.exit(0)
@@ -265,7 +267,6 @@ if __name__ == "__main__":
sys.exit(0)
setup_pid_file()
- setup_signal_handlers()
logger = logging.getLogger('server')
logger.info('OpenERP server is running, waiting for connections...')
quit_on_signals()