1
=== modified file 'ubuntuone/logger.py'
2
--- ubuntuone/logger.py	2010-04-05 14:51:51 +0000
3
+++ ubuntuone/logger.py	2011-07-06 17:02:37 +0000
4
@@ -42,7 +42,7 @@
5
42
42
6
43
43
7
44
class Logger(logging.Logger):
44
class Logger(logging.Logger):
9
45
    """Logger that support out custom levels."""
45
    """Logger that support our custom levels."""
10
46
46
11
47
    def note(self, msg, *args, **kwargs):
47
    def note(self, msg, *args, **kwargs):
12
48
        """log at NOTE level"""
48
        """log at NOTE level"""
13
49
49
14
=== modified file 'ubuntuone/platform/linux/messaging.py'
15
--- ubuntuone/platform/linux/messaging.py	2011-04-06 12:50:32 +0000
16
+++ ubuntuone/platform/linux/messaging.py	2011-07-06 17:02:37 +0000
17
@@ -22,13 +22,9 @@
18
22
# messages.
22
# messages.
19
23
23
20
24
import dbus
24
import dbus
21
25
import os
22
26
import subprocess
25
import subprocess
23
27
import sys
24
28
26
25
29
from time import time
27
from time import time
26
30
from ubuntuone.logger import basic_formatter, logging
27
31
28
32
28
29
33
try:
29
try:
30
34
    import indicate
30
    import indicate
31
@@ -42,19 +38,10 @@
32
42
TRANSLATION_DOMAIN = 'ubuntuone-control-panel'
38
TRANSLATION_DOMAIN = 'ubuntuone-control-panel'
33
43
39
34
44
from ubuntuone.status.messaging import AbstractMessaging
40
from ubuntuone.status.messaging import AbstractMessaging
35
41
from ubuntuone.status.logger import logger
36
45
42
37
46
APPLICATION_NAME = 'Ubuntu One Client'
43
APPLICATION_NAME = 'Ubuntu One Client'
38
47
44
39
48
LOG_LEVEL = logging.DEBUG
40
49
logger = logging.getLogger('ubuntuone.status')
41
50
logger.setLevel(LOG_LEVEL)
42
51
43
52
if os.environ.get('DEBUG_STATUS'):
44
53
    debug_handler = logging.StreamHandler(sys.stderr)
45
54
    debug_handler.setFormatter(basic_formatter)
46
55
    debug_handler.setLevel(LOG_LEVEL)
47
56
    logger.addHandler(debug_handler)
48
57
49
58
45
50
59
# pylint: disable=W0613
46
# pylint: disable=W0613
51
60
def open_volumes():
47
def open_volumes():
52
61
48
53
=== modified file 'ubuntuone/status/aggregator.py'
54
--- ubuntuone/status/aggregator.py	2011-06-24 21:37:58 +0000
55
+++ ubuntuone/status/aggregator.py	2011-07-06 17:02:37 +0000
56
@@ -20,14 +20,14 @@
57
20
import itertools
20
import itertools
58
21
import operator
21
import operator
59
22
import os
22
import os
61
23
import sys
23
62
24
24
63
25
import gettext
25
import gettext
64
26
26
65
27
from twisted.internet import reactor, defer
27
from twisted.internet import reactor, defer
66
28
28
67
29
from ubuntuone.clientdefs import GETTEXT_PACKAGE
29
from ubuntuone.clientdefs import GETTEXT_PACKAGE
69
30
from ubuntuone.logger import basic_formatter, logging
30
from ubuntuone.status.logger import logger
70
31
from ubuntuone.platform import session
31
from ubuntuone.platform import session
71
32
from ubuntuone.platform.notification import Notification
32
from ubuntuone.platform.notification import Notification
72
33
from ubuntuone.platform.messaging import Messaging
33
from ubuntuone.platform.messaging import Messaging
73
@@ -36,16 +36,6 @@
74
36
ONE_DAY = 24 * 60 * 60
36
ONE_DAY = 24 * 60 * 60
75
37
Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
37
Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
76
38
38
77
39
LOG_LEVEL = logging.DEBUG
78
40
logger = logging.getLogger('ubuntuone.status')
79
41
logger.setLevel(LOG_LEVEL)
80
42
81
43
if os.environ.get('DEBUG_STATUS'):
82
44
    debug_handler = logging.StreamHandler(sys.stderr)
83
45
    debug_handler.setFormatter(basic_formatter)
84
46
    debug_handler.setLevel(LOG_LEVEL)
85
47
    logger.addHandler(debug_handler)
86
48
87
49
UBUNTUONE_TITLE = Q_("Ubuntu One")
39
UBUNTUONE_TITLE = Q_("Ubuntu One")
88
50
NEW_UDFS_SENDER = Q_("New cloud folder(s) available")
40
NEW_UDFS_SENDER = Q_("New cloud folder(s) available")
89
51
FINAL_COMPLETED = Q_("File synchronization completed.")
41
FINAL_COMPLETED = Q_("File synchronization completed.")
90
52
42
91
=== added file 'ubuntuone/status/logger.py'
92
--- ubuntuone/status/logger.py	1970-01-01 00:00:00 +0000
93
+++ ubuntuone/status/logger.py	2011-07-06 17:02:37 +0000
94
@@ -0,0 +1,36 @@
95
1
# ubuntuone.syncdaemon.logger - logging utilities
96
2
#
97
3
# Author: Guillermo Gonzalez <guillermo.gonzalez@canonical.com>
98
4
#         Eric Casteleijn <eric.casteleijn@canonical.com>
99
5
#
100
6
# Copyright 2009-2011 Canonical Ltd.
101
7
#
102
8
# This program is free software: you can redistribute it and/or modify it
103
9
# under the terms of the GNU General Public License version 3, as published
104
10
# by the Free Software Foundation.
105
11
#
106
12
# This program is distributed in the hope that it will be useful, but
107
13
# WITHOUT ANY WARRANTY; without even the implied warranties of
108
14
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
109
15
# PURPOSE.  See the GNU General Public License for more details.
110
16
#
111
17
# You should have received a copy of the GNU General Public License along
112
18
# with this program.  If not, see <http://www.gnu.org/licenses/>.
113
19
""" SyncDaemon logging utilities and config. """
114
20
import logging
115
21
import os
116
22
117
23
from ubuntuone.logger import (
118
24
    _DEBUG_LOG_LEVEL,
119
25
    LOGFOLDER,
120
26
    CustomRotatingFileHandler,
121
27
    basic_formatter)
122
28
123
29
124
30
LOGFILENAME = os.path.join(LOGFOLDER, 'status.log')
125
31
logger = logging.getLogger("ubuntuone.status")
126
32
logger.setLevel(_DEBUG_LOG_LEVEL)
127
33
handler = CustomRotatingFileHandler(filename=LOGFILENAME)
128
34
handler.setFormatter(basic_formatter)
129
35
handler.setLevel(_DEBUG_LOG_LEVEL)
130
36
logger.addHandler(handler)
Reviewer	Date Requested	Status
Alejandro J. Cura (community)	2011-07-06	Approve on 2011-07-06
Facundo Batista (community)		Approve on 2011-07-06
Review via email: mp+67057@code.launchpad.net
1	=== modified file 'ubuntuone/logger.py'
2	--- ubuntuone/logger.py 2010-04-05 14:51:51 +0000
3	+++ ubuntuone/logger.py 2011-07-06 17:02:37 +0000
4	@@ -42,7 +42,7 @@
5	42		42
6	43		43
7	44	class Logger(logging.Logger):	44	class Logger(logging.Logger):
9	45	"""Logger that support out custom levels."""	45	"""Logger that support our custom levels."""
10	46		46
11	47	def note(self, msg, args, *kwargs):	47	def note(self, msg, args, *kwargs):
12	48	"""log at NOTE level"""	48	"""log at NOTE level"""
13	49		49
14	=== modified file 'ubuntuone/platform/linux/messaging.py'
15	--- ubuntuone/platform/linux/messaging.py 2011-04-06 12:50:32 +0000
16	+++ ubuntuone/platform/linux/messaging.py 2011-07-06 17:02:37 +0000
17	@@ -22,13 +22,9 @@
18	22	# messages.	22	# messages.
19	23		23
20	24	import dbus	24	import dbus
21	25	import os
22	26	import subprocess	25	import subprocess
23	27	import sys
24	28		26
25	29	from time import time	27	from time import time
26	30	from ubuntuone.logger import basic_formatter, logging
27	31
28	32		28
29	33	try:	29	try:
30	34	import indicate	30	import indicate
31	@@ -42,19 +38,10 @@
32	42	TRANSLATION_DOMAIN = 'ubuntuone-control-panel'	38	TRANSLATION_DOMAIN = 'ubuntuone-control-panel'
33	43		39
34	44	from ubuntuone.status.messaging import AbstractMessaging	40	from ubuntuone.status.messaging import AbstractMessaging
35			41	from ubuntuone.status.logger import logger
36	45		42
37	46	APPLICATION_NAME = 'Ubuntu One Client'	43	APPLICATION_NAME = 'Ubuntu One Client'
38	47		44
39	48	LOG_LEVEL = logging.DEBUG
40	49	logger = logging.getLogger('ubuntuone.status')
41	50	logger.setLevel(LOG_LEVEL)
42	51
43	52	if os.environ.get('DEBUG_STATUS'):
44	53	debug_handler = logging.StreamHandler(sys.stderr)
45	54	debug_handler.setFormatter(basic_formatter)
46	55	debug_handler.setLevel(LOG_LEVEL)
47	56	logger.addHandler(debug_handler)
48	57
49	58		45
50	59	# pylint: disable=W0613	46	# pylint: disable=W0613
51	60	def open_volumes():	47	def open_volumes():
52	61		48
53	=== modified file 'ubuntuone/status/aggregator.py'
54	--- ubuntuone/status/aggregator.py 2011-06-24 21:37:58 +0000
55	+++ ubuntuone/status/aggregator.py 2011-07-06 17:02:37 +0000
56	@@ -20,14 +20,14 @@
57	20	import itertools	20	import itertools
58	21	import operator	21	import operator
59	22	import os	22	import os
61	23	import sys	23
62	24		24
63	25	import gettext	25	import gettext
64	26		26
65	27	from twisted.internet import reactor, defer	27	from twisted.internet import reactor, defer
66	28		28
67	29	from ubuntuone.clientdefs import GETTEXT_PACKAGE	29	from ubuntuone.clientdefs import GETTEXT_PACKAGE
69	30	from ubuntuone.logger import basic_formatter, logging	30	from ubuntuone.status.logger import logger
70	31	from ubuntuone.platform import session	31	from ubuntuone.platform import session
71	32	from ubuntuone.platform.notification import Notification	32	from ubuntuone.platform.notification import Notification
72	33	from ubuntuone.platform.messaging import Messaging	33	from ubuntuone.platform.messaging import Messaging
73	@@ -36,16 +36,6 @@
74	36	ONE_DAY = 24 * 60 * 60	36	ONE_DAY = 24 * 60 * 60
75	37	Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)	37	Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
76	38		38
77	39	LOG_LEVEL = logging.DEBUG
78	40	logger = logging.getLogger('ubuntuone.status')
79	41	logger.setLevel(LOG_LEVEL)
80	42
81	43	if os.environ.get('DEBUG_STATUS'):
82	44	debug_handler = logging.StreamHandler(sys.stderr)
83	45	debug_handler.setFormatter(basic_formatter)
84	46	debug_handler.setLevel(LOG_LEVEL)
85	47	logger.addHandler(debug_handler)
86	48
87	49	UBUNTUONE_TITLE = Q_("Ubuntu One")	39	UBUNTUONE_TITLE = Q_("Ubuntu One")
88	50	NEW_UDFS_SENDER = Q_("New cloud folder(s) available")	40	NEW_UDFS_SENDER = Q_("New cloud folder(s) available")
89	51	FINAL_COMPLETED = Q_("File synchronization completed.")	41	FINAL_COMPLETED = Q_("File synchronization completed.")
90	52		42
91	=== added file 'ubuntuone/status/logger.py'
92	--- ubuntuone/status/logger.py 1970-01-01 00:00:00 +0000
93	+++ ubuntuone/status/logger.py 2011-07-06 17:02:37 +0000
94	@@ -0,0 +1,36 @@
95			1	# ubuntuone.syncdaemon.logger - logging utilities
96			2	#
97			3	# Author: Guillermo Gonzalez <guillermo.gonzalez@canonical.com>
98			4	# Eric Casteleijn <eric.casteleijn@canonical.com>
99			5	#
100			6	# Copyright 2009-2011 Canonical Ltd.
101			7	#
102			8	# This program is free software: you can redistribute it and/or modify it
103			9	# under the terms of the GNU General Public License version 3, as published
104			10	# by the Free Software Foundation.
105			11	#
106			12	# This program is distributed in the hope that it will be useful, but
107			13	# WITHOUT ANY WARRANTY; without even the implied warranties of
108			14	# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
109			15	# PURPOSE. See the GNU General Public License for more details.
110			16	#
111			17	# You should have received a copy of the GNU General Public License along
112			18	# with this program. If not, see <http://www.gnu.org/licenses/>.
113			19	""" SyncDaemon logging utilities and config. """
114			20	import logging
115			21	import os
116			22
117			23	from ubuntuone.logger import (
118			24	_DEBUG_LOG_LEVEL,
119			25	LOGFOLDER,
120			26	CustomRotatingFileHandler,
121			27	basic_formatter)
122			28
123			29
124			30	LOGFILENAME = os.path.join(LOGFOLDER, 'status.log')
125			31	logger = logging.getLogger("ubuntuone.status")
126			32	logger.setLevel(_DEBUG_LOG_LEVEL)
127			33	handler = CustomRotatingFileHandler(filename=LOGFILENAME)
128			34	handler.setFormatter(basic_formatter)
129			35	handler.setLevel(_DEBUG_LOG_LEVEL)
130			36	logger.addHandler(handler)