Ubuntu One Client

Merge lp:~nataliabidart/ubuntuone-client/remove-so-many-debug into lp:ubuntuone-client

  1. remove-so-many-debug
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: John Lenton
Approved revision: 705
Merged at revision: 707
Proposed branch: lp:~nataliabidart/ubuntuone-client/remove-so-many-debug
Merge into: lp:ubuntuone-client
Diff against target: 57 lines (+9/-6)
1 file modified
bin/ubuntuone-preferences (+9/-6)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-client/remove-so-many-debug
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Roman Yepishev (community) fieldtest Approve
Review via email: mp+35660@code.launchpad.net

Commit message

* Default logging for ubuntuone-preferences is INFO (LP: #640438).

To post a comment you must log in.
Revision history for this message
Roman Yepishev (rye) wrote :

ubuntuone-preferences is no longer that chatty.

review: Approve (fieldtest)
Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubuntuone-preferences'
2--- bin/ubuntuone-preferences 2010-09-14 00:06:24 +0000
3+++ bin/ubuntuone-preferences 2010-09-16 13:18:46 +0000
4@@ -47,12 +47,14 @@
5 from dbus.exceptions import DBusException
6 from dbus.mainloop.glib import DBusGMainLoop
7
8+LOG_LEVEL = logging.INFO
9+
10 logger = logging.getLogger("ubuntuone-preferences")
11-logger.setLevel(logging.DEBUG)
12+logger.setLevel(LOG_LEVEL)
13 handler = CustomRotatingFileHandler(filename=os.path.join(LOGFOLDER,
14 'u1-prefs.log'))
15 handler.setFormatter(basic_formatter)
16-handler.setLevel(logging.DEBUG)
17+handler.setLevel(LOG_LEVEL)
18 logger.addHandler(handler)
19
20 _ = gettext.gettext
21@@ -510,7 +512,7 @@
22 else:
23 self.status_label.set_text(_("Disconnected"))
24
25- logger.debug("starting")
26+ logger.info("Starting Ubuntu One Preferences")
27
28 def _hookup_dbus(self):
29 """
30@@ -668,7 +670,7 @@
31 self.bw_inst_box.hide()
32 else:
33 self.bw_inst_box.show()
34- logger.error(_("There was an error installing bindwood."))
35+ logger.error("There was an error installing bindwood.")
36 gtk.gdk.threads_leave()
37
38 def __check_for_bindwood(self):
39@@ -728,7 +730,7 @@
40 else:
41 self.dcouch.replicate(dbname)
42 else:
43- logger.error(_("Database enablement is unavailable."))
44+ logger.error("Database enablement is unavailable.")
45
46 def __db_check_toggled(self, checkbutton):
47 """Handle toggling a desktopcouch service toggling."""
48@@ -1052,7 +1054,8 @@
49 def got_credentialserror(self, app_name, message, detailed_error):
50 """Got an error during authentication."""
51 if app_name == clientdefs.APP_NAME:
52- logger.error("Credentials error for %s: %s - %s" % (app_name, message, detailed_error))
53+ logger.error("Credentials error for %s: %s - %s" %
54+ (app_name, message, detailed_error))
55
56 def got_authdenied(self, app_name):
57 """User denied access."""

Subscribers

People subscribed via source and target branches