From e89c88b191b8013763fb265daf655488309c15e5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 25 Sep 2006 13:24:27 -0400 Subject: [PATCH 1/2] Fix location of cache debug prints --- services/presence/Buddy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/presence/Buddy.py b/services/presence/Buddy.py index 2c5d9b6b..18209feb 100644 --- a/services/presence/Buddy.py +++ b/services/presence/Buddy.py @@ -151,6 +151,7 @@ class Buddy(object): if icon and len(icon): icon = base64.b64decode(icon) self._set_icon(icon) + logging.debug("%s: adding retrieved icon to cache." % self._nick_name) self._icon_cache.add_icon(icon) if (result_status == network.RESULT_FAILED or not icon) and self._icon_tries < 3: @@ -172,8 +173,8 @@ class Buddy(object): logging.debug("%s: icon cache hit for %s." % (self._nick_name, icon_hash)) self._set_icon(icon) return False + logging.debug("%s: icon cache miss, fetching icon from buddy..." % self._nick_name) - logging.debug("%s: icon cache miss, adding icon to cache." % self._nick_name) from sugar.p2p import Stream buddy_stream = Stream.Stream.new_from_service(service, start_reader=False) writer = buddy_stream.new_writer(service) From 7ba30ea0d2f82e3f9099f00e7868ceccab51d5d5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 25 Sep 2006 13:42:37 -0400 Subject: [PATCH 2/2] Clean up debug messages --- services/presence/Buddy.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/services/presence/Buddy.py b/services/presence/Buddy.py index 18209feb..3cbd1a55 100644 --- a/services/presence/Buddy.py +++ b/services/presence/Buddy.py @@ -151,14 +151,13 @@ class Buddy(object): if icon and len(icon): icon = base64.b64decode(icon) self._set_icon(icon) - logging.debug("%s: adding retrieved icon to cache." % self._nick_name) self._icon_cache.add_icon(icon) if (result_status == network.RESULT_FAILED or not icon) and self._icon_tries < 3: self._icon_tries = self._icon_tries + 1 - logging.debug("Failed to retrieve buddy icon for '%s' on try %d of %d" % (self._nick_name, \ - self._icon_tries, 3)) - gobject.timeout_add(1000, self._get_buddy_icon, service) + if self._icon_tries >= 3: + logging.debug("Failed to retrieve buddy icon for '%s'." % self._nick_name) + gobject.timeout_add(1000, self._get_buddy_icon, service, True) return False def _get_buddy_icon(self, service, retry=False):