Merge lp:~thisfred/ubuntuone-client/fix-status-logging into lp:ubuntuone-client

[Eric Casteleijn]

Fixed logging for ubuntuone.status.

Fixed logging for ubuntuone.status.

[lp:~thisfred/ubuntuone-client/fix-status-logging]

1044. By Eric Casteleijn on 2011-07-06

removed unused import

[Facundo Batista (facundo)]

Like it!

review: Approve

[Alejandro J. Cura (alecu)]

Looks good!

review: Approve

=== modified file 'ubuntuone/logger.py'
--- ubuntuone/logger.py	2010-04-05 14:51:51 +0000
+++ ubuntuone/logger.py	2011-07-06 17:02:37 +0000
@@ -42,7 +42,7 @@
 
 
 class Logger(logging.Logger):
-    """Logger that support out custom levels."""
+    """Logger that support our custom levels."""
 
     def note(self, msg, *args, **kwargs):
         """log at NOTE level"""

=== modified file 'ubuntuone/platform/linux/messaging.py'
--- ubuntuone/platform/linux/messaging.py	2011-04-06 12:50:32 +0000
+++ ubuntuone/platform/linux/messaging.py	2011-07-06 17:02:37 +0000
@@ -22,13 +22,9 @@
 # messages.
 
 import dbus
-import os
 import subprocess
-import sys
 
 from time import time
-from ubuntuone.logger import basic_formatter, logging
-
 
 try:
     import indicate
@@ -42,19 +38,10 @@
 TRANSLATION_DOMAIN = 'ubuntuone-control-panel'
 
 from ubuntuone.status.messaging import AbstractMessaging
+from ubuntuone.status.logger import logger
 
 APPLICATION_NAME = 'Ubuntu One Client'
 
-LOG_LEVEL = logging.DEBUG
-logger = logging.getLogger('ubuntuone.status')
-logger.setLevel(LOG_LEVEL)
-
-if os.environ.get('DEBUG_STATUS'):
-    debug_handler = logging.StreamHandler(sys.stderr)
-    debug_handler.setFormatter(basic_formatter)
-    debug_handler.setLevel(LOG_LEVEL)
-    logger.addHandler(debug_handler)
-
 
 # pylint: disable=W0613
 def open_volumes():

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-06-24 21:37:58 +0000
+++ ubuntuone/status/aggregator.py	2011-07-06 17:02:37 +0000
@@ -20,14 +20,14 @@
 import itertools
 import operator
 import os
-import sys
+
 
 import gettext
 
 from twisted.internet import reactor, defer
 
 from ubuntuone.clientdefs import GETTEXT_PACKAGE
-from ubuntuone.logger import basic_formatter, logging
+from ubuntuone.status.logger import logger
 from ubuntuone.platform import session
 from ubuntuone.platform.notification import Notification
 from ubuntuone.platform.messaging import Messaging
@@ -36,16 +36,6 @@
 ONE_DAY = 24 * 60 * 60
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
 
-LOG_LEVEL = logging.DEBUG
-logger = logging.getLogger('ubuntuone.status')
-logger.setLevel(LOG_LEVEL)
-
-if os.environ.get('DEBUG_STATUS'):
-    debug_handler = logging.StreamHandler(sys.stderr)
-    debug_handler.setFormatter(basic_formatter)
-    debug_handler.setLevel(LOG_LEVEL)
-    logger.addHandler(debug_handler)
-
 UBUNTUONE_TITLE = Q_("Ubuntu One")
 NEW_UDFS_SENDER = Q_("New cloud folder(s) available")
 FINAL_COMPLETED = Q_("File synchronization completed.")

=== added file 'ubuntuone/status/logger.py'
--- ubuntuone/status/logger.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/status/logger.py	2011-07-06 17:02:37 +0000
@@ -0,0 +1,36 @@
+# ubuntuone.syncdaemon.logger - logging utilities
+#
+# Author: Guillermo Gonzalez <[e-mail]>
+#         Eric Casteleijn <[e-mail]>
+#
+# Copyright 2009-2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+""" SyncDaemon logging utilities and config. """
+import logging
+import os
+
+from ubuntuone.logger import (
+    _DEBUG_LOG_LEVEL,
+    LOGFOLDER,
+    CustomRotatingFileHandler,
+    basic_formatter)
+
+
+LOGFILENAME = os.path.join(LOGFOLDER, 'status.log')
+logger = logging.getLogger("ubuntuone.status")
+logger.setLevel(_DEBUG_LOG_LEVEL)
+handler = CustomRotatingFileHandler(filename=LOGFILENAME)
+handler.setFormatter(basic_formatter)
+handler.setLevel(_DEBUG_LOG_LEVEL)
+logger.addHandler(handler)