Merge lp:~unifield-team/unifield-server/restart-and-update-cto into lp:unifield-server/sprint5

[Samus CTO (OpenERP)]

Hello,

This is the Auto-Updater for OpenERP Server Sprint5

[jftempo (jfb-tempo-consulting)]

Please create an issue in Jira, with a description and a link to this branch.
This issue has to be "Runbot Validated" and assigned to me.

And please replace the print statement in your code by a clean log.

review: Needs Resubmitting

[Samus CTO (OpenERP) (cto-openerp)]

> Please create an issue in Jira, with a description and a link to this branch.
> This issue has to be "Runbot Validated" and assigned to me.
>
> And please replace the print statement in your code by a clean log.

I'm not aware about Jira's process I will ask Duy for that.

In the other hand, I think it's hard to have a better quality code than that with the use of print.

I can use sys.stdout (or stderr) if you prefer.

The point is the Update process is launched with minimal dependencies as possible (and only Python's ones (and psycopg)). If I want to use logger I will need to import tools.config and netsvc which are OpenERP.

What's your position?

Regards

review: Needs Information

=== modified file 'bin/openerp-server.py'
--- bin/openerp-server.py	2011-01-06 13:06:54 +0000
+++ bin/openerp-server.py	2012-09-27 15:11:20 +0000
@@ -30,6 +30,9 @@
 (c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a.
 """
 
+from updater import do_update
+do_update()
+
 #----------------------------------------------------------
 # python imports
 #----------------------------------------------------------
@@ -215,7 +218,7 @@
 if os.name == 'posix':
     signal.signal(signal.SIGQUIT, dumpstacks)
 
-def quit():
+def quit(restart=False):
     netsvc.Agent.quit()
     netsvc.Server.quitAll()
     if tools.config['pidfile']:
@@ -235,7 +238,17 @@
                 # and would present the forced shutdown
                 thread.join(0.05)
                 time.sleep(0.05)
-    sys.exit(0)
+                time.sleep(1)
+                if os.name == 'nt':
+                    try:
+                        logger.info("Killing", thread.getName())
+                        thread._Thread__stop()
+                    except:
+                        logger.info(str(thread.getName()) + ' could not be terminated')
+    if not restart:
+        sys.exit(0)
+    else:
+	os.execv(sys.executable, [sys.executable] + sys.argv)
 
 if tools.config['pidfile']:
     fd = open(tools.config['pidfile'], 'w')
@@ -247,9 +260,11 @@
 
 logger.info('OpenERP server is running, waiting for connections...')
 
-while netsvc.quit_signals_received == 0:
-    time.sleep(60)
-
-quit()
+tools.restart_required = False
+
+while netsvc.quit_signals_received == 0 and not tools.restart_required:
+    time.sleep(5)
+
+quit(restart=tools.restart_required)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/updater.py'
--- bin/updater.py	1970-01-01 00:00:00 +0000
+++ bin/updater.py	2012-09-27 15:11:20 +0000
@@ -0,0 +1,130 @@
+import os
+import sys
+import psycopg2
+from datetime import datetime
+
+## Unix-like find
+def find(path):
+    files = os.listdir(path)
+    for name in iter(files):
+        abspath = path+os.path.sep+name
+        if os.path.isdir( abspath ) and not os.path.islink( abspath ):
+            files.extend( map(lambda x:name+os.path.sep+x, os.listdir(abspath)) )
+    return files
+
+## Define way to forward logs
+def warn(*args):
+    sys.stderr.write(" ".join(map(lambda x:str(x), args))+"\n")
+
+## Try...Resume...
+def Try(command):
+    try:
+        command()
+    except:
+        e, msg = sys.exc_info()[0].__name__, str(sys.exc_info()[1])
+        warn(str(msg))
+        return False
+    else:
+        return True
+
+## Python free rmtree
+def rmtree(files, path=None, verbose=False):
+    if path is None and isinstance(files, str):
+        path, files = files, find(files)
+    for f in reversed(files):
+        target = os.path.join(path, f) if path is not None else f
+        if os.path.isfile(target) or os.path.islink(target):
+            warn("unlink", target)
+            os.unlink( target )
+        elif os.path.isdir(target):
+            warn("rmdir", target)
+            os.rmdir( target )
+
+def do_update():
+## We expect to be in the bin/ directory to proceed
+    if os.path.exists('update.lock'):
+        rev_file = os.path.join('.update','revisions.txt')
+        hist_file = "revision_history.txt"
+        infos = {'exec_path':os.getcwd()}
+        revisions = None
+        cur = None
+        conn = None
+        update_revisions = None
+        files = None
+        args = list(sys.argv)
+        for i, x in enumerate(args):
+            if x in ('-d', '-u'):
+                args[i] = None
+                args[i+1] = None
+        args = filter(lambda x:x is not None, args)
+        try:
+            ## Read DB name
+            f = open('update.lock')
+            infos = eval(f.read())
+            f.close()
+            revisions = ",".join( map(lambda x:"'"+str(x)+"'", infos['revisions']) )
+            ## Connect to the DB
+            conn = psycopg2.connect(database=infos['dbname'], user=infos['db_user'], password=infos['db_password'], host=infos['db_host'], port=infos['db_port'])
+            conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
+            cur = conn.cursor()
+            ## Explore .update directory
+            files = find('.update')
+            ## Prepare backup directory
+            if not os.path.exists('backup'):
+                os.mkdir('backup')
+            else:
+                rmtree('backup')
+            ## Update Files
+            warn("Updating...")
+            for f in files:
+                target = os.path.join('.update', f)
+                bak = os.path.join('backup', f)
+                if os.path.isdir(target):
+                    if os.path.isfile(f) or os.path.islink(f):
+                        os.unlink(f)
+                    if not os.path.exists(f):
+                        os.mkdir(f)
+                    os.mkdir(bak)
+                else:
+                    if os.path.exists(f):
+                        warn("`%s' -> `%s'" % (f, bak))
+                        os.rename(f, bak)
+                    warn("`%s' -> `%s'" % (target, f))
+                    os.rename(target, f)
+            ## Update installed revisions in DB
+            cur.execute("""UPDATE sync_client_version SET state = 'installed', applied = '%s' WHERE name in (%s)"""
+                % ( datetime.today().strftime("%Y-%m-%d %H:%M:%S"), revisions ))
+            warn("Update successful.")
+            warn("Revisions added: ", ", ".join( infos['revisions'] ))
+            args.extend(['-d', infos['dbname'], '-u', 'all'])
+        except:
+            warn("Update failure!")
+            ## Update DB to mark revisions as not-installed
+            if cur and infos:
+                Try(lambda:cur.execute("""UPDATE sync_client_version SET state = 'not-installed' WHERE name in (%s)"""
+                    % ( revisions )))
+            ## Restore backup and purge .update
+            if files:
+                warn("Restoring...")
+                for f in reversed(files):
+                    target = os.path.join('backup', f)
+                    if os.path.isfile(target) or os.path.islink(target):
+                        warn("`%s' -> `%s'" % (target, f))
+                    elif os.path.isdir(target):
+                        warn("rmdir", target)
+                        os.rmdir( target )
+                warn("Purging...")
+                Try(lambda:rmtree(files, '.update'))
+                warn("rmdir", '.update')
+                Try(lambda:os.rmdir( '.update' ))
+        finally:
+            if cur: cur.close()
+            if conn: conn.close()
+        ## Remove lock file
+        warn("rm", 'update.lock')
+        Try(lambda:os.unlink( 'update.lock' ))
+        warn("Restart OpenERP in", infos['exec_path'], "with:",args)
+        if infos: os.chdir(infos['exec_path'])
+        os.execv(sys.executable, [sys.executable] + args)
+
+