diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-09 19:18:54 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-09 19:18:54 (GMT) |
commit | 46d128c85a21bf48131de921d1a30177ea1441da (patch) | |
tree | 1df473c3e273952de7767aab19f3cda91c8b2c69 /sugar | |
parent | b44a2916ba410366078fd2f8dc5ddb10b3c4e65a (diff) |
Cleanup the logs stuff a bit.
Diffstat (limited to 'sugar')
-rw-r--r-- | sugar/activity/activityfactory.py | 12 | ||||
-rw-r--r-- | sugar/env.py | 7 | ||||
-rw-r--r-- | sugar/logger.py | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py index d3f279d..d5bdaf7 100644 --- a/sugar/activity/activityfactory.py +++ b/sugar/activity/activityfactory.py @@ -18,7 +18,7 @@ import logging import subprocess -import signal +import time import dbus import gobject @@ -28,13 +28,11 @@ from sugar.presence import presenceservice from sugar.activity.activityhandle import ActivityHandle from sugar.activity import registry from sugar.datastore import datastore -from sugar import logger from sugar import util +from sugar import env import os -signal.signal(signal.SIGCHLD, signal.SIG_IGN) - # #3903 - this constant can be removed and assumed to be 1 when dbus-python # 0.82.3 is the only version used if dbus.version >= (0, 82, 3): @@ -103,9 +101,9 @@ def get_command(activity, activity_id=None, object_id=None, uri=None): return command def open_log_file(activity, activity_id): - name = '%s-%s.log' % (activity.bundle_id, activity_id[:5]) - path = os.path.join(logger.get_logs_dir(), name) - return open(path, 'w') + timestamp = str(int(time.time())) + name = '%s-%s.log' % (activity.bundle_id, timestamp) + return open(env.get_logs_path(name), 'w') class ActivityCreationHandler(gobject.GObject): """Sugar-side activity creation interface diff --git a/sugar/env.py b/sugar/env.py index e3e0a51..65b8b0c 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -64,6 +64,13 @@ def get_profile_path(path=None): else: return base +def get_logs_path(path=None): + base = get_profile_path('logs') + if path != None: + return os.path.join(base, path) + else: + return base + def get_user_activities_path(): return os.path.expanduser('~/Activities') diff --git a/sugar/logger.py b/sugar/logger.py index bc6af85..f9c28c2 100644 --- a/sugar/logger.py +++ b/sugar/logger.py @@ -67,7 +67,7 @@ def set_level(level): if levels.has_key(level): logging.getLogger('').setLevel(levels[level]) -def start(log_filename=None, redirect_io=True): +def start(log_filename=None, redirect_io=False): if os.environ.has_key('SUGAR_LOGGER_LEVEL'): set_level(os.environ['SUGAR_LOGGER_LEVEL']) |