Merge lp:~mikemc/ubuntuone-client/log-monitor into lp:ubuntuone-client

[Mike McCracken]

- Log to syncdaemon log which monitor implementation is used. (LP: #1042336)

- Log to syncdaemon log which monitor implementation is used. (LP: #1042336)

[Roberto Alsina (ralsina)]

Looks good to me.

review: Approve

=== 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 21:57:20 +0000
@@ -32,6 +32,8 @@
 
 from twisted.internet import defer
 
+from ubuntuone.syncdaemon.logger import root_logger as logger
+
 DEFAULT_MONITOR = 'default'
 
 
@@ -70,6 +72,7 @@
         DEFAULT_MONITOR: linux.FilesystemMonitor,
     }
 
+
 # mantain old API
 FilesystemMonitor = FILEMONITOR_IDS[DEFAULT_MONITOR]
 
@@ -77,21 +80,28 @@
 @defer.inlineCallbacks
 def get_filemonitor_class(monitor_id=None):
     """Return the class to be used."""
+    logger.debug('File monitor ids for platform "%s" are "%s"', sys.platform,
+                 FILEMONITOR_IDS)
+
     if monitor_id is None:
-        # use default
+        logger.debug('monitor_id is None, using default.')
         monitor_id = 'default'
 
     if monitor_id not in FILEMONITOR_IDS:
-        raise NoAvailableMonitorError(
-                'No available monitor with id "%s"could be found.' % monitor_id)
+        msg = 'No available monitor with id %r could be found.'
+        raise NoAvailableMonitorError(msg % monitor_id)
 
     # retrieve the correct class and assert it can be used
     cls = FILEMONITOR_IDS[monitor_id]
+    logger.debug('Checking availability of monitor class %ns', 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: