Merge lp:~fabien-morin/unifield-server/fm-us-959 into lp:unifield-server

[jftempo]

=== modified file 'bin/pooler.py'
--- bin/pooler.py	2015-03-05 16:54:18 +0000
+++ bin/pooler.py	2016-05-24 07:29:48 +0000
@@ -23,7 +23,20 @@
 
 pool_dic = {}
 
-def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False, pooljobs=True):
+def get_db_and_pool(db_name, force_demo=False, status=None,
+        update_module=False, pooljobs=True, upgrade_modules=True):
+    '''
+    Return the db and pool.
+
+    :param db_name: database name
+    :param force_demo: load demo data
+    :param status: status dictionary for keeping track of progress
+    :param update_module: update the list of available modules
+    :pooljobs: restart the cron job
+    :upgrade_modules: start the modules upgrade process ('-u base') if needed
+    :rtype: list of two object: (dabase, pool)
+
+    '''
     if not status:
         status={}
 
@@ -47,10 +60,11 @@
         try:
             pool.init_set(cr, False)
             pool.get('ir.actions.report.xml').register_all(cr)
-            if not updater.do_upgrade(cr, pool):
-                pool_dic.pop(db_name)
-                # please do not change "updater.py" in the message, or change unifield-web/addons/openerp/utils/rpc.py accordingly
-                raise Exception("updater.py told us that OpenERP version doesn't match database version!")
+            if upgrade_modules:
+                if not updater.do_upgrade(cr, pool):
+                    pool_dic.pop(db_name)
+                    # please do not change "updater.py" in the message, or change unifield-web/addons/openerp/utils/rpc.py accordingly
+                    raise Exception("updater.py told us that OpenERP version doesn't match database version!")
             cr.commit()
         finally:
             cr.close()
@@ -81,8 +95,10 @@
     return get_db_and_pool(db_name)[0]
 
 
-def get_pool(db_name, force_demo=False, status=None, update_module=False):
-    pool = get_db_and_pool(db_name, force_demo, status, update_module)[1]
+def get_pool(db_name, force_demo=False, status=None, update_module=False,
+        upgrade_modules=True):
+    pool = get_db_and_pool(db_name, force_demo, status, update_module,
+            upgrade_modules=upgrade_modules)[1]
     return pool
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'bin/service/web_services.py'
--- bin/service/web_services.py	2016-02-04 12:55:56 +0000
+++ bin/service/web_services.py	2016-05-24 07:29:48 +0000
@@ -72,7 +72,8 @@
             passwd = params[0]
             params = params[1:]
             security.check_super(passwd)
-        elif method in [ 'db_exist', 'list', 'list_lang', 'server_version', 'check_timezone' ]:
+        elif method in [ 'db_exist', 'list', 'list_lang', 'server_version',
+                'check_timezone', 'connected_to_prod_sync_server' ]:
             # params = params
             # No security check for these methods
             pass
@@ -338,6 +339,28 @@
         res.sort()
         return res
 
+    def exp_connected_to_prod_sync_server(self, db_name):
+        """Return True if db_name is connected to a production SYNC_SERVER,
+        False otherwise"""
+
+        connection = sql_db.db_connect(db_name)
+        # it the db connnected to a sync_server ?
+        server_connecion_module = pooler.get_pool(db_name, upgrade_modules=False).get('sync.client.sync_server_connection')
+        if not server_connecion_module:
+            return False
+
+        if not getattr(server_connecion_module, '_uid', False):
+            return False
+
+        cr = connection.cursor()
+        cr.execute('''SELECT host, database
+        FROM sync_client_sync_server_connection''')
+        host, database = cr.fetchone()
+        cr.close()
+        if host and 'localhost' in host and database == 'fm-us-959_SYNC_SERVER':
+            return True
+        return False
+
     def exp_change_admin_password(self, new_password):
         tools.config['admin_passwd'] = new_password
         tools.config.save()
@@ -435,7 +458,7 @@
         elif method == 'logout':
             if auth:
                 auth.logout(params[1])
-            logger.notifyChannel("web-service", netsvc.LOG_INFO,'Logout %s from database %s'%(login,db))
+            logger.notifyChannel("web-service", netsvc.LOG_INFO,'Logout %s from database %s' % (params[1], db))
             return True
         elif method in ['about', 'timezone_get', 'get_server_environment',
                         'login_message','get_stats', 'check_connectivity',