Merge lp:~jfb-tempo-consulting/unifield-server/US-4403 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/sync_client/backup.py'
--- bin/addons/sync_client/backup.py	2018-02-22 14:23:17 +0000
+++ bin/addons/sync_client/backup.py	2018-03-19 10:53:13 +0000
@@ -189,6 +189,7 @@
     def exp_dump(self, cr, uid, ids, suffix='', context=None):
         if context is None:
             context = {}
+        version_instance_module = self.pool.get('sync.version.instance.monitor')
         bkp = self.browse(cr, uid, ids, context)
         if bkp and bkp[0] and bkp[0].name: #US-786 If no path define -> return
             bck = bkp[0]
@@ -198,17 +199,6 @@
                 outfile = os.path.join(bck.name, "%s-%s%s-%s.dump" %
                                        (cr.dbname, datetime.now().strftime("%Y%m%d-%H%M%S"),
                                         suffix, version))
-                version_instance_module = self.pool.get('sync.version.instance.monitor')
-                postgres_disk_space = version_instance_module._get_default_postgresql_disk_space(cr, uid)
-                unifield_disk_space = version_instance_module._get_default_unifield_disk_space(cr, uid)
-                vals = {
-                    'version': version,
-                    'postgresql_disk_space': postgres_disk_space,
-                    'unifield_disk_space': unifield_disk_space,
-                }
-
-                version_instance_module.create(cr, uid, vals, context=context)
-
                 bkpfile = open(outfile,"wb")
                 bkpfile.close()
             except Exception, e:

=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2018-02-28 09:38:56 +0000
+++ bin/addons/sync_client/sync_client.py	2018-03-19 10:53:13 +0000
@@ -1183,6 +1183,23 @@
         context['lang'] = 'en_US'
         logger = context.get('logger')
         self._logger.info("Start synchronization")
+
+        version_instance_module = self.pool.get('sync.version.instance.monitor')
+        try:
+            version = self.pool.get('backup.config').get_server_version(cr, uid, context=context)
+            postgres_disk_space = version_instance_module._get_default_postgresql_disk_space(cr, uid)
+            unifield_disk_space = version_instance_module._get_default_unifield_disk_space(cr, uid)
+            version_instance_module.create(cr, uid, {
+                'version': version,
+                'postgresql_disk_space': postgres_disk_space,
+                'unifield_disk_space': unifield_disk_space,
+            }, context=context)
+
+        except Exception:
+            cr.rollback()
+            logging.getLogger('version.instance.monitor').exception('Cannot generate instance monitor data')
+            # do not block sync
+            pass
         self.set_rules(cr, uid, context=context)
         self.pull_update(cr, uid, context=context)
         self.pull_message(cr, uid, context=context)