← Back to branch summary

~camptocamp/openobject-server/trunk-geoengine

« back to all changes in this revision

Viewing changes to openerp-server

  • Committer: nicolas.bessi at camptocamp
  • Date: 2011-09-14 07:44:08 UTC
  • mfrom: (3575.1.14 openobject-server)
  • Revision ID: nicolas.bessi@camptocamp.com-20110914074408-6578sltkjnvksnix
[MRG] from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp-server
215
215
        os.unlink(config['pidfile'])
216
216
    logger = logging.getLogger('server')
217
217
    logger.info("Initiating shutdown")
218
 
    logger.info("Hit CTRL-C again or send a second signal to force the sutdown.")
 
218
    logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
219
219
    logging.shutdown()
220
220
 
221
221
    # manually join() all threads before calling sys.exit() to allow a second signal
240
240
 
241
241
    config = openerp.tools.config
242
242
 
 
243
    setup_signal_handlers()
 
244
 
243
245
    if config["test_file"]:
244
246
        run_test_file(config['db_name'], config['test_file'])
245
247
        sys.exit(0)
265
267
        sys.exit(0)
266
268
 
267
269
    setup_pid_file()
268
 
    setup_signal_handlers()
269
270
    logger = logging.getLogger('server')
270
271
    logger.info('OpenERP server is running, waiting for connections...')
271
272
    quit_on_signals()