Merge lp:~unifield-team/unifield-wm/sync-sp-170 into lp:unifield-wm/sync

[jftempo]

=== modified file 'sync_client/sync_client.py'
--- sync_client/sync_client.py	2014-08-28 12:44:27 +0000
+++ sync_client/sync_client.py	2014-09-17 12:19:58 +0000
@@ -33,7 +33,6 @@
 from psycopg2 import OperationalError
 
 import logging
-from sync_common import sync_log
 
 from threading import Thread, RLock, Lock
 import pooler
@@ -325,7 +324,6 @@
     @sync_process('data_push')
     def push_update(self, cr, uid, context=None):
         context = context or {}
-        logger = context.get('logger')
 
         entity = self.get_entity(cr, uid, context)
 
@@ -337,18 +335,19 @@
             updates_count = self.create_update(cr, uid, context=context)
             cr.commit()
             cont = updates_count > 0
-            self._logger.info("init")
+            self._logger.info("Push data :: Updates created: %d" % updates_count)
         if cont or entity.state == 'update_send':
             updates_count = self.send_update(cr, uid, context=context)
             cr.commit()
             cont = True
-            self._logger.info("sent update")
+            self._logger.info("Push data :: Updates sent: %d" % updates_count)
         if cont or entity.state == 'update_validate':
             server_sequence = self.validate_update(cr, uid, context=context)
             cr.commit()
-            if logger and server_sequence:
-                logger.append(_("Update's server sequence: %d") % server_sequence)
-            self._logger.info("update validated")
+            if server_sequence:
+                self._logger.info(_("Push data :: New server's sequence number: %d") % server_sequence)
+
+
 
         return True
 
@@ -447,7 +446,6 @@
     @sync_process('data_pull')
     def pull_update(self, cr, uid, recover=False, context=None):
         context = context or {}
-        logger = context.get('logger')
 
         entity = self.get_entity(cr, uid, context=context)
         if entity.state not in ('init', 'update_pull'):
@@ -466,8 +464,10 @@
         updates_count = self.retrieve_update(cr, uid, max_packet_size, recover=recover, context=context)
         self._logger.info("::::::::The instance " + entity.name + " pulled: " + str(res[1]) + " messages and " + str(updates_count) + " updates.")        
         updates_executed = self.execute_updates(cr, uid, context=context)
-        if updates_executed == 0 and updates_count > 0 and logger:
-            logger.append(_("Warning: no update to execute, this case should never occurs."))
+        if updates_executed == 0 and updates_count > 0:
+            self._logger.warning("No update to execute, this case should never occurs.")
+
+        self._logger.info("Pull data :: Number of data pull: %s" % updates_count)
         return True
 
     def set_last_sequence(self, cr, uid, context=None):
@@ -475,6 +475,7 @@
         proxy = self.pool.get("sync.client.sync_server_connection").get_connection(cr, uid, "sync.server.sync_manager")
         res = proxy.get_max_sequence(entity.identifier)
         if res and res[0]:
+            self._logger.info("Pull data :: Last sequence: %s" % res[1])
             return self.write(cr, uid, entity.id, {'max_update' : res[1]}, context=context)
         elif res and not res[0]:
             raise Exception, res[1]
@@ -593,7 +594,6 @@
     @sync_process('msg_push')
     def push_message(self, cr, uid, context=None):
         context = context or {}
-        logger = context.get('logger')
         entity = self.get_entity(cr, uid, context)
 
         if entity.state not in ['init', 'msg_push']:
@@ -603,9 +603,11 @@
             self.create_message(cr, uid, context=context)
             cr.commit()
 
-        self.send_message(cr, uid, context=context)
+        nb_msg = self.send_message(cr, uid, context=context)
         cr.commit()
 
+        self._logger.info("Push messages :: Number of messages pushed: %d" % nb_msg)
+
         return True
 
     def create_message(self, cr, uid, context=None):
@@ -677,9 +679,14 @@
             raise SkipStep
 
         self.get_message(cr, uid, context=context)
+<<<<<<< TREE
         # UTP-1177: Reset the message ids of the entity at the server side
         proxy.reset_message_ids(entity.identifier)
         self.execute_message(cr, uid, context=context)
+=======
+        msg_count = self.execute_message(cr, uid, context=context)
+        self._logger.info("Pull message :: Number of messages pulled: %s" % msg_count)
+>>>>>>> MERGE-SOURCE
         return True
 
     def get_message(self, cr, uid, context=None):
@@ -769,10 +776,12 @@
 
     @sync_process()
     def sync(self, cr, uid, context=None):
+        self._logger.info("Start synchronization")
         self.pull_update(cr, uid, context=context)
         self.pull_message(cr, uid, context=context)
         self.push_update(cr, uid, context=context)
         self.push_message(cr, uid, context=context)
+        self._logger.info("Synchronization succesfully done")
         return True
 
     def get_upgrade_status(self, cr, uid, context=None):
@@ -816,6 +825,7 @@
         This class is also a singleton
 
     """
+    _logger = logging.getLogger('sync.client.sync_server_connection')
 
     def _auto_init(self,cr,context=None):
         res = super(Connection, self)._auto_init(cr, context=context)
@@ -897,6 +907,11 @@
             return True
         try:
             con = self._get_connection_manager(cr, uid, context=context)
+            sync_args = {
+                'client_name': cr.dbname,
+                'server_name': con.database,
+            }
+            self._logger.info('Client \'%(client_name)s\' attempts to connect to sync. server \'%(server_name)s\'' % sync_args)
             connector = self.connector_factory(con)
             if not getattr(self, '_password', False):
                 self._password = con.login
@@ -912,6 +927,7 @@
         except BaseException, e:
             raise osv.except_osv(_("Error"), _(unicode(e)))
 
+        self._logger.info('Client \'%(client_name)s\' succesfully connected to sync. server \'%(server_name)s\'' % sync_args)
         return True
 
     def action_connect(self, cr, uid, ids, context=None):
@@ -929,14 +945,21 @@
         return rpc.Object(cnx, model)
 
     def disconnect(self, cr, uid, context=None):
+        con = self._get_connection_manager(cr, uid, context=context)
+        sync_args = {
+            'client_name': cr.dbname,
+            'server_name': con.database,
+        }
         entity = self.pool.get('sync.client.entity')
         if entity.is_syncing():
             try:
                 entity._renew_sync_lock()
             except StandardError:
+                self._logger.warning('Error during the disconnection of client \'%(client_name)s\'' % sync_args)
                 return False
             entity.sync_cursor.close()
         self._uid = False
+        self._logger.info('Client \'%(client_name)s\' succesfully disconnected from the sync. server \'%(server_name)s\'' % sync_args)
         return True
 
     def action_disconnect(self, cr, uid, ids, context=None):

=== modified file 'sync_client/update.py'
--- sync_client/update.py	2014-08-27 09:07:35 +0000
+++ sync_client/update.py	2014-09-17 12:19:58 +0000
@@ -471,7 +471,13 @@
                 #1 conflict detection
                 if self._conflict(cr, uid, update.sdref, update.version, context=context):
                     #2 if conflict => manage conflict according rules : report conflict and how it's solve
+<<<<<<< TREE
                     logs[update.id] = sync_log(self, "Conflict detected!", 'warning', data=(update.id, update.sdref)) + "\n"
+=======
+                    index_id = eval(update.fields).index('id')
+                    sd_ref = eval(update.values)[index_id]
+                    logs[update.id] = sync_log(self, "Conflict detected!", 'warning', data=(update.id, sd_ref)) + "\n"
+>>>>>>> MERGE-SOURCE
 
             if bad_fields:
                 import_fields = [import_fields[i] for i in range(len(import_fields)) if i not in bad_fields]

=== modified file 'sync_server/message.py'
--- sync_server/message.py	2014-08-27 12:52:35 +0000
+++ sync_server/message.py	2014-09-17 12:19:58 +0000
@@ -94,6 +94,7 @@
                 'source': entity.id,
             }, context=context)
 
+        self._logger.info("[%s] Message push :: Number of message pushed: %s" % (entity.name, len(package)))
         return (True, "Message received")
 
     def _get_destination(self, cr, uid, dest, context=None):
@@ -154,6 +155,7 @@
             }
             packet.append(message)
 
+        self._logger.info("[%s] Message pull :: Number of message pulled: %s" % (entity.name, len(packet)))
         return packet
 
     def set_message_as_received(self, cr, uid, entity, message_uuids, context=None):

=== modified file 'sync_server/update.py'
--- sync_server/update.py	2014-01-20 09:02:10 +0000
+++ sync_server/update.py	2014-09-17 12:19:58 +0000
@@ -261,6 +261,9 @@
         if update_ids:
             sequence = self._get_next_sequence(cr, uid, context=context)
             self.write(cr, 1, update_ids, {'sequence' : sequence}, context=context)
+        self._logger.info("[%s] Data Push :: Number of data pushed: %d" % (entity.name, len(update_ids)))
+        if sequence:
+            self._logger.info("[%s] Data Push :: New server's sequence number: %s" % (entity.name, sequence))
         return (True, sequence)
 
     def _get_next_sequence(self, cr, uid, context=None):
@@ -444,6 +447,9 @@
                     'handle_priority' : update.handle_priority,
                 })
 
+        self._logger.info("[%s] Data pull :: Client last sequence number: %s" % (entity.name, last_seq))
+        self._logger.info("[%s] Data pull :: Server last sequence number: %s" % (entity.name, self.get_last_sequence(cr, uid)))
+        self._logger.info("[%s] Data pull :: Number of data pulled: %s" % (entity.name, len(update_to_send)))
         return data
     
     def get_additional_forced_field(self, update):