Merge lp:~dobey/ubuntuone-client/oauth-log-fixes into lp:ubuntuone-client

[dobey]

Rotate the oauth log and cap at 1MB
Change a few logger.debug messages to logger.error
Clean up the usage of callback_error in the oauth process

[Rick McBride (rmcbride)]

Other than the below, this looks good.
== Python Lint Notices ==

./ubuntuone/oauthdesktop/auth.py:
    261: undefined name 'e'

review: Approve

[lp:~dobey/ubuntuone-client/oauth-log-fixes]

241. By dobey on 2009-10-07

Fix typo: should be errors instead of e

[Guillermo Gonzalez (verterok)]

review: Approve

[lp:~dobey/ubuntuone-client/oauth-log-fixes]

242. By dobey on 2009-10-08

Change log level to INFO
Change startup version logging to info level

=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-10-02 17:55:29 +0000
+++ bin/ubuntuone-client-applet	2009-10-08 13:35:16 +0000
@@ -45,9 +45,7 @@
 from urllib import quote
 
 from ubuntuone.oauthdesktop.logger import setupLogging
-setupLogging()
-import logging
-logger = logging.getLogger("UbuntuOne.Client.Applet")
+logger = setupLogging("UbuntuOne.Client.Applet")
 
 DBusGMainLoop(set_as_default=True)
 
@@ -96,8 +94,8 @@
             login = Login(dbus.service.BusName(DBUS_IFACE_AUTH_NAME,
                                                bus=dbus.SessionBus()))
 
-            logger.debug(_("Starting Ubuntu One client version %s") %
-                         clientdefs.VERSION)
+            logger.info(_("Starting Ubuntu One client version %s") %
+                        clientdefs.VERSION)
 
             # Whether or not we are authorized
             self.is_authorized = False
 
=== modified file 'ubuntuone/oauthdesktop/auth.py'
--- ubuntuone/oauthdesktop/auth.py	2009-10-07 15:09:56 +0000
+++ ubuntuone/oauthdesktop/auth.py	2009-10-08 13:35:16 +0000
@@ -37,9 +37,7 @@
 from twisted.web import server, resource
 
 from ubuntuone.oauthdesktop.logger import setupLogging
-setupLogging()
-import logging
-logger = logging.getLogger("UbuntuOne.OAuthDesktop.auth")
+logger = setupLogging("UbuntuOne.OAuthDesktop.auth")
 
 
 class NoAccessToken(Exception):
@@ -144,6 +142,13 @@
                                              'oauth-consumer-key':
                                              self.consumer.key})
 
+    def _forward_error_callback(self, error):
+        """Forward an error through callback_error()"""
+        if self.callback_error:
+            self.callback_error(str(error))
+        else:
+            raise error
+
     def get_access_token(self):
         """Get the access token from the keyring.
 
@@ -229,11 +234,8 @@
             fp = opener.open(oauth_request.http_url, oauth_request.to_postdata())
             data = fp.read()
         except IOError, e:
-            if self.callback_error:
-                self.callback_error(str(e))
-                return
-            else:
-                raise e
+            self._forward_error_callback(e)
+            return
         
         # we deliberately trap anything that might go wrong when parsing the
         # token, because we do not want this to explicitly fail
@@ -243,8 +245,9 @@
             logger.debug("Token successfully requested")
             return out_token
         except:
-            logger.debug("Token was not successfully retrieved: data was '%s'",
+            logger.error("Token was not successfully retrieved: data was '%s'",
                data)
+            self._forward_error_callback(oauth.OAuthError(data))
 
     def open_in_browser(self, url):
         """Open the given URL in the user's web browser."""
@@ -255,10 +258,7 @@
         if p.returncode != 0:
             errors = "".join(p.stderr.readlines())
             if errors != "":
-                if self.callback_error is not None:
-                    self.callback_error(errors)
-                else:
-                    raise Exception(errors)
+                self._forward_error_callback(IOError(errors))
 
     def acquire_access_token_if_online(self, description=None, store=False):
         """Check to see if we are online before trying to acquire"""
@@ -377,7 +377,7 @@
         logger.debug("Retrieving access token from OAuth")
         access_token = self.make_token_request(oauth_request)
         if not access_token:
-            logger.debug("Failed to get access token.")
+            logger.error("Failed to get access token.")
             if self.callback_denied is not None:
                 self.callback_denied()
         else:
 
=== modified file 'ubuntuone/oauthdesktop/logger.py'
--- ubuntuone/oauthdesktop/logger.py	2009-06-26 17:01:42 +0000
+++ ubuntuone/oauthdesktop/logger.py	2009-10-08 13:35:16 +0000
@@ -20,6 +20,8 @@
 import logging
 import xdg.BaseDirectory
 
+from logging.handlers import RotatingFileHandler
+
 home = xdg.BaseDirectory.xdg_cache_home
 LOGFOLDER = os.path.join(home, 'ubuntuone', 'log')
 # create log folder if it doesn't exists
@@ -28,7 +30,19 @@
 
 LOGFILENAME = os.path.join(LOGFOLDER, 'oauth-login.log')
 
-def setupLogging():
+# Only log this level and above
+LOG_LEVEL = logging.INFO
+
+root_formatter = logging.Formatter(
+    fmt="%(asctime)s:%(msecs)s %(name)s %(message)s")
+root_handler = RotatingFileHandler(LOGFILENAME, maxBytes=1048576,
+                                   backupCount=1)
+root_handler.setLevel(LOG_LEVEL)
+    
+def setupLogging(log_domain):
     """Create basic logger to set filename"""
-    logging.basicConfig(level=logging.DEBUG, filename=LOGFILENAME,
-                        format="%(asctime)s:%(msecs)s %(name)s %(message)s")
+    logger = logging.getLogger(log_domain)
+    logger.propagate = False
+    logger.setLevel(LOG_LEVEL)
+    logger.addHandler(root_handler)
+    return logger
 
=== modified file 'ubuntuone/oauthdesktop/main.py'
--- ubuntuone/oauthdesktop/main.py	2009-09-08 13:28:01 +0000
+++ ubuntuone/oauthdesktop/main.py	2009-10-08 13:35:16 +0000
@@ -34,9 +34,7 @@
 from twisted.internet.threads import deferToThread
 
 from ubuntuone.oauthdesktop.logger import setupLogging
-setupLogging()
-import logging
-logger = logging.getLogger("UbuntuOne.OAuthDesktop.main")
+logger = setupLogging("UbuntuOne.OAuthDesktop.main")
 
 DBusGMainLoop(set_as_default=True)
 
 
=== modified file 'ubuntuone/syncdaemon/logger.py'
--- ubuntuone/syncdaemon/logger.py	2009-08-29 01:16:01 +0000
+++ ubuntuone/syncdaemon/logger.py	2009-10-08 13:35:16 +0000
@@ -33,7 +33,7 @@
 # extra levels
 # be more verbose than logging.DEBUG(10)
 TRACE = 5
-# info that we always want to log (logging.ERROR+1)
+# info that we almost always want to log (logging.ERROR - 1)
 NOTE = logging.ERROR - 1
 
 # map names to the extra levels