From patchwork Fri Jan 3 15:18:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1217363 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VTCjh4cB"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47q7qG0FSJz9sR0 for ; Sat, 4 Jan 2020 02:19:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B8DDD2201C; Fri, 3 Jan 2020 15:19:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fw39m3uebpPP; Fri, 3 Jan 2020 15:19:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A30E32156C; Fri, 3 Jan 2020 15:19:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1154A1BF599 for ; Fri, 3 Jan 2020 15:19:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 073BC869C4 for ; Fri, 3 Jan 2020 15:19:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XGj2BpiVbofp for ; Fri, 3 Jan 2020 15:19:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0C98F86970 for ; Fri, 3 Jan 2020 15:19:09 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id y17so42782300wrh.5 for ; Fri, 03 Jan 2020 07:19:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LExQxcuijj7MHUVtMn+xG9vyZvsJ33kzBdQFUxPcwkw=; b=VTCjh4cBkyjcO/XFtuTrjG8I3CIiIoad0ETmWotTIRHZPH12ybnlQrClXV9ljVJ5IS lRVpT56CG8ymTcwMAYE2njdt55xU3qVq9KemREUx+VUFBbF5BJq5tnJfjJOOjQOQXh1j 6UoBhgJjPnZrrrVsU52xVlpjvqiq8XxY7kH3k1+9ShOOaRMZU+HmWoThaum32t3mixqu ol5xU2Hj07UZ+n8d5+fkwNAEOeSfUJvRdjV1aGUFhNkp58WyH0C/CGDcwN2i2e82sRDs d315iBgFbiIzuVp7fCLpXG4oIrwAQ6CQyaRL5e1/twOspQQDzkL6SLqXSCyxCkmxBUfL DGfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LExQxcuijj7MHUVtMn+xG9vyZvsJ33kzBdQFUxPcwkw=; b=iS9eZchjAl8qxqyX3krhudmBxAHh4LSkz8pzZRydDuwN7sWZvRbO8O+4b3+B/EqWVl q/7TL7TxMBeVRxlIAe22HN27vqeNW5Y4PEo0uCl2sMELSAycsjGzg8bh23/uKAGlJxAm ZjlkMqH7eSlcGwcdb1vK60wX5ugmv3QmrSYClWqEN7aCEYT2IFhp84X1YNiLK29Gmthn F/A/7hM7ckxufJtGNNVMrbJQXD+Q5rxb/MgP912m3o6ksoPLIuuMaA2VuoNGc/L+CmA/ JNpjorhIBVtHiv1/nW4kiPCLqEzQmobnpGGYVRfAQAI1qYYjy3TklDyV86tAbiW6+8f3 t8Gg== X-Gm-Message-State: APjAAAX+4Dd7FCRvNQK3rLYmKFYFsRun2i8pyK/jdHz6njFXx58cbHgZ UTm1+tMJtC4kbDN81Quw4Zv5eY5y X-Google-Smtp-Source: APXvYqx0Cy5hSPxetLTYFNkQjk0ts/9ZFlj/nMlJPEskc9Bnrpv5lQKsvf1vygkj+TJzTaXMQ5QklA== X-Received: by 2002:a5d:55d1:: with SMTP id i17mr86430159wrw.165.1578064747243; Fri, 03 Jan 2020 07:19:07 -0800 (PST) Received: from hthiery01.sab.local ([213.135.10.150]) by smtp.gmail.com with ESMTPSA id u16sm12460565wmj.41.2020.01.03.07.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2020 07:19:06 -0800 (PST) From: Heiko Thiery To: buildroot@buildroot.org Date: Fri, 3 Jan 2020 16:18:46 +0100 Message-Id: <20200103151849.10956-10-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200103151849.10956-1-heiko.thiery@gmail.com> References: <20200103151849.10956-1-heiko.thiery@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 09/11] support/scripts/pkg-stats; use url status from dict for check X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Thiery Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Heiko Thiery --- support/scripts/pkg-stats | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index b0c2db2b93..dd3c6566a0 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -364,23 +364,23 @@ def package_init_make_info(): def check_url_status_worker(url, url_status): - if url_status != "Missing" and url_status != "No Config.in": + if url_status[0] == "ok": try: url_status_code = requests.head(url, timeout=30).status_code if url_status_code >= 400: - return "Invalid(%s)" % str(url_status_code) + return ('error', 'invalid({})'.format(url_status_code)) except requests.exceptions.RequestException: - return "Invalid(Err)" - return "Ok" + return ('error', 'invalid(Err)') + return ("ok", "Valid") return url_status def check_package_urls(packages): Package.pool = Pool(processes=64) for pkg in packages: - pkg.url_worker = pkg.pool.apply_async(check_url_status_worker, (pkg.url, pkg.url_status)) + pkg.url_worker = pkg.pool.apply_async(check_url_status_worker, (pkg.url, pkg.status['url'])) for pkg in packages: - pkg.url_status = pkg.url_worker.get(timeout=3600) + pkg.status['url'] = pkg.url_worker.get(timeout=3600) def release_monitoring_get_latest_version_by_distro(pool, name):