From patchwork Thu Jan 23 10:02:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Kjaergaard X-Patchwork-Id: 313492 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 267C22C00A8 for ; Thu, 23 Jan 2014 21:02:14 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 502313FDB3 for ; Thu, 23 Jan 2014 11:02:11 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 8C50C3F81D for ; Thu, 23 Jan 2014 11:02:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1980; q=dns/txt; s=ironport1; t=1390471329; x=1422007329; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=arSvjfaTCQU7jMFsVCb9kbt5ZRd21veqIi8V5AvC/30=; b=uOM7oJY4PvJDOfKEvgyAtVDWAqT9fr1xFhqq/KY62AxRw0DFuG9ceWRz JxszVZuJH7NSds8gGobQdGRx69w5hT4YZ4fOD778M/e7ZnjZ2v97EQE3Q SVaTA35/4sj5ECLXh8DnxlFbxXve/1C48QZIivFhd1bMDLv8DHxlKL8go U=; X-IronPort-AV: E=Sophos;i="4.95,705,1384297200"; d="scan'208";a="4329570" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 23 Jan 2014 11:02:08 +0100 Received: from arh116.prevas.se (172.16.11.15) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.347.0; Thu, 23 Jan 2014 11:02:08 +0100 From: To: Subject: [core 1/3] fetch/url: use logger methods instead of prints Date: Thu, 23 Jan 2014 11:02:00 +0100 Message-ID: <1390471322-24372-2-git-send-email-jabk@prevas.dk> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1390471322-24372-1-git-send-email-jabk@prevas.dk> References: <1390471322-24372-1-git-send-email-jabk@prevas.dk> MIME-Version: 1.0 X-Originating-IP: [172.16.11.15] X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Jacob Kjaergaard --- lib/oelite/fetch/url.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/oelite/fetch/url.py b/lib/oelite/fetch/url.py index b76eb11..a7bf3fc 100644 --- a/lib/oelite/fetch/url.py +++ b/lib/oelite/fetch/url.py @@ -4,6 +4,7 @@ import os import urlgrabber import urlgrabber.progress import hashlib +from oebakery import die, err, warn, info, debug class UrlFetcher(): @@ -114,17 +115,17 @@ class UrlFetcher(): class SimpleProgress(urlgrabber.progress.BaseMeter): def _do_end(self, amount_read, now=None): - print "grabbed %d bytes in %.2f seconds" %(amount_read,self.re.elapsed_time()) + debug("grabbed %d bytes in %.2f seconds" %(amount_read,self.re.elapsed_time())) def grab(url, filename, timeout=120, retry=5, proxy=None, ftpmode=False): - print "Grabbing", url + debug("Grabbing %s"%(url)) def grab_fail_callback(data): # Only print debug here when non fatal retries, debug in other cases # is already printed if (data.exception.errno in retrycodes) and (data.tries != data.retry): - print "grabbing retry %d/%d, exception %s"%( - data.tries, data.retry, data.exception) + debug("grabbing retry %d/%d, exception %s"%( + data.tries, data.retry, data.exception)) try: retrycodes = urlgrabber.grabber.URLGrabberOptions().retrycodes if 12 not in retrycodes: @@ -138,7 +139,7 @@ def grab(url, filename, timeout=120, retry=5, proxy=None, ftpmode=False): if not downloaded_file: return False except urlgrabber.grabber.URLGrabError as e: - print 'URLGrabError %i: %s' % (e.errno, e.strerror) + info('URLGrabError %i: %s' % (e.errno, e.strerror)) if os.path.exists(filename): os.unlink(filename) return False