diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-26 08:08:47 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-26 08:08:47 (GMT) |
| commit | 7e45c5446d656a8ece74b6362dab2961b77a960a (patch) | |
| tree | c1c09507c0e482ff73c6456387d2ed17ecc8f9a4 /sugar | |
| parent | 0a11ebafe87ac7a94c7e87b48c2e9dc035fb886e (diff) | |
| parent | 20d5eaf4bcae21985845cf132411a3f7dc66c0fb (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/datastore/datastore.py | 5 | ||||
| -rw-r--r-- | sugar/datastore/dbus_helpers.py | 5 | ||||
| -rw-r--r-- | sugar/logger.py | 9 |
3 files changed, 15 insertions, 4 deletions
diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py index ef1dd45..256c12f 100644 --- a/sugar/datastore/datastore.py +++ b/sugar/datastore/datastore.py @@ -172,7 +172,7 @@ def create(): metadata['mtime'] = metadata['ctime'] return DSObject(object_id=None, metadata=metadata, file_path=None) -def write(ds_object, update_mtime=True, reply_handler=None, error_handler=None): +def write(ds_object, update_mtime=True, reply_handler=None, error_handler=None, timeout=-1): logging.debug('datastore.write') properties = ds_object.metadata.get_dictionary().copy() @@ -185,7 +185,8 @@ def write(ds_object, update_mtime=True, reply_handler=None, error_handler=None): properties, ds_object.file_path, reply_handler=reply_handler, - error_handler=error_handler) + error_handler=error_handler, + timeout=timeout) else: ds_object.object_id = dbus_helpers.create(properties, ds_object.file_path) diff --git a/sugar/datastore/dbus_helpers.py b/sugar/datastore/dbus_helpers.py index 6680cc1..f0cfa3b 100644 --- a/sugar/datastore/dbus_helpers.py +++ b/sugar/datastore/dbus_helpers.py @@ -37,12 +37,13 @@ def create(properties, filename): logging.debug('dbus_helpers.create: ' + object_id) return object_id -def update(uid, properties, filename, reply_handler=None, error_handler=None): +def update(uid, properties, filename, reply_handler=None, error_handler=None, timeout=-1): logging.debug('dbus_helpers.update: %s, %s, %s' % (uid, filename, properties)) if reply_handler and error_handler: _data_store.update(uid, dbus.Dictionary(properties), filename, reply_handler=reply_handler, - error_handler=error_handler) + error_handler=error_handler, + timeout=timeout) else: _data_store.update(uid, dbus.Dictionary(properties), filename) diff --git a/sugar/logger.py b/sugar/logger.py index 6d9ff3a..e857044 100644 --- a/sugar/logger.py +++ b/sugar/logger.py @@ -103,6 +103,15 @@ def _get_logs_dir(): return logs_dir def start(module_id): + # Only log if logging is set up for the activity + module_key = module_id.upper() + "_DEBUG" + emulator = False + if os.environ.has_key("SUGAR_EMULATOR"): + if os.environ["SUGAR_EMULATOR"] == "yes": + emulator = True + if not os.environ.has_key(module_key) and not emulator: + return + log_writer = LogWriter(module_id) root_logger = logging.getLogger('') |