Merge lp:~nataliabidart/ubuntuone-client/fix-803598 into lp:ubuntuone-client

[Natalia Bidart]

- Log smartly to avoid crowding the syncdaemon.log file (LP: #803598).

[Roberto Alsina (ralsina)]

+1 on code review

review: Approve

=== modified file 'ubuntuone/platform/windows/filesystem_notifications.py'
--- ubuntuone/platform/windows/filesystem_notifications.py	2011-06-21 10:20:24 +0000
+++ ubuntuone/platform/windows/filesystem_notifications.py	2011-06-29 20:34:28 +0000
@@ -152,10 +152,9 @@
             events_queue = Queue()
         self.events_queue = events_queue
 
-    
     @longpath(paths_indexes=[1])
     def _path_is_dir(self, path):
-        """"Check if the path is a dir and update the local subdir list."""
+        """Check if the path is a dir and update the local subdir list."""
         self.log.debug('Testing if path "%s" is a dir', path)
         is_dir = False
         if os.path.exists(path):
@@ -488,8 +487,10 @@
 
 
 class Notifier(object):
-    """
-    Read notifications, process events. Inspired by the pyinotify.Notifier
+    """Read notifications, process events.
+
+    Inspired by the pyinotify.Notifier.
+
     """
 
     def __init__(self, watch_manager, default_proc_fun=None, read_freq=0,
@@ -510,15 +511,14 @@
         self._threshold = threshold
         self._timeout = timeout
 
+        self.log.debug('Processing events with threashold %s and timeout %s.',
+            self._threshold, self._timeout)
+
     def proc_fun(self):
         return self._default_proc_fun
 
     def process_events(self):
-        """
-        Process the event given the threshold and the timeout.
-        """
-        self.log.debug('Processing events with threashold: %s and timeout: %s',
-            self._threshold, self._timeout)
+        """Process the event given the threshold and the timeout."""
         # we will process an amount of events equal to the threshold of
         # the notifier and will block for the amount given by the timeout
         processed_events = 0
@@ -531,21 +531,20 @@
                 else:
                     raw_event = self._watch_manager.events_queue.get(
                         timeout=self._timeout)
-                self.log.debug('Raw event is %s.', raw_event)
                 watch = self._watch_manager.get_watch(raw_event.wd)
                 if watch is None:
                     # Not really sure how we ended up here, nor how we should
                     # handle these types of events and if it is appropriate to
                     # completly skip them (like we are doing here).
-                    self.log.warning('Unable to retrieve Watch object '
-                        + 'associated to %s', raw_event)
+                    self.log.warning('Unable to retrieve watch object for '
+                                     'raw event: %r', raw_event)
                     processed_events += 1
                     continue
+                self.log.debug('Raw event is %r, watch is %r, proc_fun is %r.',
+                               raw_event, watch, watch.proc_fun)
                 if watch and watch.proc_fun:
-                    self.log.debug('Executing proc_fun from watch.')
                     watch.proc_fun(raw_event)  # user processings
                 else:
-                    self.log.debug('Executing default_proc_fun')
                     self._default_proc_fun(raw_event)
                 processed_events += 1
             except Empty: