[MERGE] trunk

bzr revid: al@openerp.com-20110924145258-16r9qi7hr3dip1jz

1 files changed, 8 insertions, 3 deletions

diff --git a/openerp-server b/openerp-server
index 277451df74e..94dc6d6df6f 100755
--- a/openerp-server
+++ b/openerp-server
@@ -27,7 +27,7 @@ OpenERP is an ERP+CRM program for small and medium businesses.
 The whole source code is distributed under the terms of the
 GNU Public Licence.
 
-(c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
+(c) 2003-TODAY, Fabien Pinckaers - OpenERP SA
 """
 
 import logging
@@ -88,8 +88,11 @@ def setup_pid_file():
 
 def preload_registry(dbname):
     """ Preload a registry, and start the cron."""
-    db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
-    pool.get('ir.cron').restart(db.dbname)
+    try:
+        db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
+        pool.get('ir.cron').restart(db.dbname)
+    except Exception:
+        logging.exception('Failed to initialize database `%s`.', dbname)
 
 def run_test_file(dbname, test_file):
     """ Preload a registry, possibly run a test file, and start the cron."""
@@ -233,6 +236,8 @@ def quit_on_signals():
 
 if __name__ == "__main__":
 
+    os.environ["TZ"] = "UTC"
+
     check_root_user()
     openerp.tools.config.parse_config(sys.argv[1:])
     check_postgres_user()