Merge lp:~mandel/ubuntuone-client/fs-darwin-logging into lp:ubuntuone-client

[Manuel de la Peña]

- Added extra logging to know the fs monitor implementation used (LP: #1042336).

- Added extra logging to know the fs monitor implementation used (LP: #1042336).

[Mike McCracken (mikemc)]

This didn't work for me - I couldn't find the output anywhere.
I changed it to import logger from ubuntuone.syncdaemon and write the messages with logger.root_logger.debug(), then I got output in syncdaemon.log, which is where I was expecting it…

review: Needs Fixing

[Mike McCracken (mikemc)]

fixed elsewhere branched from this code

review: Disapprove

=== modified file 'ubuntuone/platform/filesystem_notifications/monitor/__init__.py'
--- ubuntuone/platform/filesystem_notifications/monitor/__init__.py	2012-08-01 14:25:58 +0000
+++ ubuntuone/platform/filesystem_notifications/monitor/__init__.py	2012-08-27 17:10:24 +0000
@@ -28,12 +28,14 @@
 # files in the program, then also delete it here.
 """Filesystem monitors per platform."""
 
+import logging
 import sys
 
 from twisted.internet import defer
 
 DEFAULT_MONITOR = 'default'
-
+logger = logging.getLogger('ubuntuone.platform.filesystem_notifications'
+        + '.monitor')
 
 class NoAvailableMonitorError(Exception):
     """Raised if there are no available monitors in the system."""
@@ -70,6 +72,9 @@
         DEFAULT_MONITOR: linux.FilesystemMonitor,
     }
 
+logger.debug('File monitor ids for platform "%s" are "%s"', sys.platform,
+        FILEMONITOR_IDS)
+
 # mantain old API
 FilesystemMonitor = FILEMONITOR_IDS[DEFAULT_MONITOR]
 
@@ -78,6 +83,7 @@
 def get_filemonitor_class(monitor_id=None):
     """Return the class to be used."""
     if monitor_id is None:
+        logger.debug('monitor_id is None, using platforms default monitor.')
         # use default
         monitor_id = 'default'
 
@@ -87,11 +93,15 @@
 
     # retrieve the correct class and assert it can be used
     cls = FILEMONITOR_IDS[monitor_id]
+    logger.debug('Monitor class to use %s', cls)
     is_available = yield cls.is_available_monitor()
 
     if is_available:
+        logger.debug('Monitor is available, returning monitor with id "%s"',
+                monitor_id)
         defer.returnValue(cls)
     elif not is_available and monitor_id != DEFAULT_MONITOR:
+        logger.debug('Monitor is NOT available, returning default monitor.')
         cls = yield get_filemonitor_class(DEFAULT_MONITOR)
         defer.returnValue(cls)
     else: