From patchwork Mon Jan 16 19:50:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Braunwarth X-Patchwork-Id: 1727244 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::240; helo=mail-lj1-x240.google.com; envelope-from=swupdate+bncbaabb6wvs2pamgqezktqfga@googlegroups.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=EYBISS2r; dkim-atps=neutral Received: from mail-lj1-x240.google.com (mail-lj1-x240.google.com [IPv6:2a00:1450:4864:20::240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NwjNb5SMCz23h4 for ; Tue, 17 Jan 2023 06:52:30 +1100 (AEDT) Received: by mail-lj1-x240.google.com with SMTP id by38-20020a05651c1a2600b0028b8260999esf1285022ljb.7 for ; Mon, 16 Jan 2023 11:52:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673898747; cv=pass; d=google.com; s=arc-20160816; b=DLygJZIJvEGI9r4wVER1hTOAzZmms+vn4jmxiEK0zqTIB+ynWoqSJwgCLCYX8DA+FD lUr2luUBydMF2iQn2zktzkWolyF9TOd+dXXJdX3YtwxYi2BzzdoPPit+jqoLsZnDL0Yn 0o5r84/3ygs7ELHfrD3ofI0ueeKKoTK8KXX+sE8LYBcNi2oIyycq7GgWHq+dphvOUUBS 43lDMJ9JMkwMnNG55ZgkWhiE2WH7Q2o0MnjDcZ98BfqGbGjmEyt8bE9e6J0TjvyePqO3 G2nTLEKuF9F7/os3Ch50TimC/woOTQZyUKT/RowAXmTpIv1Kn/XlYhNj/EO7mSiXQPRU qUYw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=kT2aSjmEExvBXe4L6c1PMGmAX+EKrnodRV6w6f7LfCQ=; b=AbFIpDKsPMRWKxfhOLzNYG+MVqtR64dHuTWGD360ywrcZNEprJoTHwX2eCAiXeIfEC r3O//49aXQt7Ye7kTpgYVEHm2lzhvGyKikpl3lYc7yGWwBRK0HCk5Rt3SpPk2do9Bumy UeQK2+iMnTInZtkd5b5xJkp9BttIPpbkUyH1XrgOrUXAprauYhj8w1fwBaLiyIaBZGdZ /ei2LEEGg5UEh/tmC9jFDm1CNmtQpDaEzOEtNHpHwPrmz0BopQEfY0hLqE4omVsGsqVz hS0FeZT53BU0cmD3mZ9Wbajx7YDzaQabuVm6Dev3uoTyRcrhfpo+GAPWxKIhY5sDH6dJ jSLA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=kT2aSjmEExvBXe4L6c1PMGmAX+EKrnodRV6w6f7LfCQ=; b=EYBISS2r1CTbfai7xTsQghq2t/onTK3DpSuZXCXujr7a+jopruDn3pdfOOWPnqu/q+ RxutG4Kuk8Yj/GVn6dhXQ+vm7gY7gf93RVIdcrJ9GKv68kThO/Uc6p5fmemN9wwZON02 GI6J8FlMdM/mEz2sp8UIK5xDWuPaSIdS76mOlJliGjv9TdMcbM4elUfUqGnbo21Ge/AZ fXBNKzh/uhZ6eM7euWIPpel2EVnKuO1Mv8MDxZRnyJYr1MztqA/vmQ+wLq3GiO7O25/H ny1v/yW7R27SnKFaCqqBbDoOvvNRMZVgbIJlEYZE449ZXqJKmr7RQOVMM7XRlgOQjsuK KUpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=kT2aSjmEExvBXe4L6c1PMGmAX+EKrnodRV6w6f7LfCQ=; b=oMDNyJDophiKD+tfg9qYixTDiAcO7WqZmjvHP14QkrJ11qYjtKBRexJ6y+XOkR0aBl +xS7I2NaSNsgreZ5HgWzQVmTwdO9490TqZJJS4LJeG2gbP27dnfiei7X0uKb+qQlWjOZ E6E8uXJRoCEhCCNFPvc9DqCIfIxazRUBn8IcXw2DWcWJbbx7u9TdSzjHtL6Nvgqgf1g1 C7o/RyEdrjvI2WTB7H3ZGRUNSUJWOVp56ky904UGqp5mNHXzM3fbq4OpiCPVlSHC2NN+ Z56pIMqAPcazF0qFLbIJW7XwSP0G1Ff0tXnO2wWS1cdVWgxDOhNWxNWLWrFn4HANaPeq 0XMg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AFqh2kp5527dAoTjbYbqJdOJ7IR5tFoxgcpbPFucAKYhAb+aTqetg4+P Mwl4sNrdXUM9CMXT5eUwj/E= X-Google-Smtp-Source: AMrXdXsu1YyWNzkkfLjNBrp5gNLbyJcVFmMuzgp4ia6iVWgONlW3yssxwbtEm7gGOysAX52ZYMY5NA== X-Received: by 2002:a2e:3c08:0:b0:287:cebe:afe2 with SMTP id j8-20020a2e3c08000000b00287cebeafe2mr60305lja.26.1673898747354; Mon, 16 Jan 2023 11:52:27 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6512:3681:b0:4d1:8575:2d31 with SMTP id d1-20020a056512368100b004d185752d31ls1623684lfs.0.-pod-prod-gmail; Mon, 16 Jan 2023 11:52:26 -0800 (PST) X-Received: by 2002:a05:6512:ea1:b0:4b5:3200:eb37 with SMTP id bi33-20020a0565120ea100b004b53200eb37mr4003119lfb.43.1673898746141; Mon, 16 Jan 2023 11:52:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673898746; cv=none; d=google.com; s=arc-20160816; b=Iq1TrBwvPwLl9wnMckd0LKsNaljLjpjlunly4Wuvwq1SqeEVUiFjxO7A2dVOE1VFvL 1MFduitxfEkxQFxfvjIcCbCfCOm4FP+9VXxoAY2ErVseKAEjIQNZ6V07PmbUvYgrHrdk 4Ms+Tfk5Fg+JyZRGts0HlDnrZpR87Dby3lospffkW50CT7z63N52pyROKb7q1fRHqoEn P+Vvula5WD5gmYpLNvsYZ6WvTlLdPGB7/Po9MmgPAnji1S+wDx4Y/3IfYvtHpMtEL0eY gCgXggeE3tNPYrgp42bnbBQwgLQlrHgVj2w6GCsSK9HvDJTuHBQGIbbbOIADdRbJNaJN LHFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=lAdeU+eyTUaJ1WPx9rUloheYoJ+eKwMqNU/AqSOc70E=; b=nlJqxmHpXmZuCTWeS6/PdFRqWofyvxHm/De/szcEoBLJAtmGK5ljIsl/pzYg9RdMp4 gUvwToGofviR0+VzHlJPwrEcbsSrSwIxVs9/nW9s9dJvibYoFKEHFy5p2UA2JJkDR74o By3KfIw3f4E3HqaUe4JhH1csIDX5MBOA9JppMXledl//RjxXcRpkAHKtLL9xMZWXC+5t ss7Hiyj9RA3KKg/p0H+OgAvBWqjMERzZmq5cmPRP5q9hwLTnyAav3GgGKP/JGiAZujIv DXIzwLtivlk6f/9CScUub0u/ua60+34qAngGtlYLKdqTuULYBpvZqT7PI+K6l4usfPuz W+ew== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Received: from bergelmir.uberspace.de (bergelmir.uberspace.de. [185.26.156.157]) by gmr-mx.google.com with ESMTPS id k5-20020ac257c5000000b004d1527c0905si438706lfo.6.2023.01.16.11.52.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2023 11:52:26 -0800 (PST) Received-SPF: pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) client-ip=185.26.156.157; Received: (qmail 5708 invoked by uid 989); 16 Jan 2023 19:52:25 -0000 From: Daniel Braunwarth To: swupdate@googlegroups.com Cc: daniel@braunwarth.dev Subject: [swupdate] [PATCH 1/5] examples/client: use lazy logging Date: Mon, 16 Jan 2023 20:50:55 +0100 Message-Id: <20230116195059.25744-2-daniel@braunwarth.dev> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116195059.25744-1-daniel@braunwarth.dev> References: <20230116195059.25744-1-daniel@braunwarth.dev> MIME-Version: 1.0 X-Rspamd-Bar: ----- X-Rspamd-Report: R_MISSING_CHARSET(0.5) MIME_GOOD(-0.1) REPLY(-4) MID_CONTAINS_FROM(1) BAYES_HAM(-2.999999) X-Rspamd-Score: -5.599999 Received: from unknown (HELO unkown) (::1) by bergelmir.uberspace.de (Haraka/2.8.28) with ESMTPSA; Mon, 16 Jan 2023 20:52:25 +0100 X-Original-Sender: daniel@braunwarth.dev X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Fixes https://pylint.pycqa.org/en/latest/user_guide/messages/warning/logging-not-lazy.html Signed-off-by: Daniel Braunwarth --- examples/client/swupdate_client.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/client/swupdate_client.py b/examples/client/swupdate_client.py index a65121e..14711a6 100755 --- a/examples/client/swupdate_client.py +++ b/examples/client/swupdate_client.py @@ -52,7 +52,7 @@ class SWUpdater: data = json.loads(message) except json.decoder.JSONDecodeError: # As of 2021.04, the version info message contains invalid json - self._logger.warning(f"json parse error: {message}") + self._logger.warning("json parse error: %s", message) continue if data["type"] != "message": @@ -86,8 +86,8 @@ class SWUpdater: if response.status_code != 200: self._logger.error( - "Cannot upload software image: {}".format(response.status_code) - ) + "Cannot upload software image: %s", + response.status_code) return False self._logger.info( @@ -100,7 +100,7 @@ class SWUpdater: except FileNotFoundError: self._logger.info("swu file not found") except requests.exceptions.ConnectionError as e: - self._logger.info("Connection Error:\n%s" % str(e)) + self._logger.info("Connection Error:\n%s", e) return False async def start_tasks(self, timeout): From patchwork Mon Jan 16 19:50:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Braunwarth X-Patchwork-Id: 1727243 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33e; helo=mail-wm1-x33e.google.com; envelope-from=swupdate+bncbaabb6wvs2pamgqezktqfga@googlegroups.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=HRKjlwv6; dkim-atps=neutral Received: from mail-wm1-x33e.google.com (mail-wm1-x33e.google.com [IPv6:2a00:1450:4864:20::33e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NwjNb5Lvcz23h2 for ; Tue, 17 Jan 2023 06:52:30 +1100 (AEDT) Received: by mail-wm1-x33e.google.com with SMTP id bi18-20020a05600c3d9200b003d991844dbcsf18909009wmb.4 for ; Mon, 16 Jan 2023 11:52:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673898746; cv=pass; d=google.com; s=arc-20160816; b=kQjT7kZj12iKGhRKADkzAc1ZH3fRRbvr7LBZ58gWbybTtHS6MItSNSiHKGtiORfpwe 2j7fGkTv3hhnRKVvTQQQWeRYRjvbB/g+9Dvlzmu17QBV1lS2RCAKNQwgxcgFPTfSpE8Z +IM12He9orMgmEJ5bP3HjezMNZBHMbPrn9Y5H2dEv6giszz+079OdX9TyARPj1RrJwMh fj6pkg5FVj4Tjc1APlLMrvrBQardLU0jcL9U7a7TFmf3cwx/1HRfv5PAl391NZuDh3k6 9p27QPOAkmqkcb2vXmuipTwYGeHNhXzyURqEYwonJJNDFap8ZZUMi9yIA/tPMJYzSLds Hd3A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=P/qSM438BX8iVMpu06JWKlUpFtoMg+OI8fM8Q1eOHyw=; b=oUnbOJDfh2IYLPal8IL48ijg0RnC9LG4sGa2Y4a9Ul8btKjizEk5RymNRDHZpAYiP4 czL/lYE+5lIX/hqy1gFIhNDHmG0DHWeR6h1Ncf80Wlb4B3OjYLAoABehQJaRpeKFV9BJ 6yFK+r6ENzsF6hTTGRYI3YerxHKIxsztQv73ZeddXof8kQNOzi5OmEq9xGEghJZAtX/p /Pvwzd2UvO0stmqsea6BMFuPoAzxS2MYXo8RN0KMebD/iIBqut1FNFJx5iGoMUk30C/U GtfHd91ELblDdYrHztf0ACcfRlZ8CJRzL+vEKWZE8/xqbXID4he/nNPT+qAMYCttC6EB XaNw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=P/qSM438BX8iVMpu06JWKlUpFtoMg+OI8fM8Q1eOHyw=; b=HRKjlwv6gjvW9bXhPDiB6lC77cR9n8Y1iqd9qAQHxlh/aR5bBvgHf2edUUxhbdSFhY UeOOaJrzJ3aSlDUqoT5YhMwL9/OKHSHSluHhPVOyvebOOKpgCNJKniUxj8QD77J0Fg6H UNnyUTK84KghQAok18HnfPFZ0kHbf4paq5o0kZrgow4Emd2c153EszzTmknRmA6RHTus HCiB/lOejQhSRo2t1IYwBlmdk9C/GsP4VNptMUaaAeKrZrAjw+1I8cVw3fVsXvDXLB0i 1XPChxqzzaFtJreDHk8wjYv4+IK5navnATYOKbVrXhwqTa+PIe7h35W0GTH2P3rDMR8g xWAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=P/qSM438BX8iVMpu06JWKlUpFtoMg+OI8fM8Q1eOHyw=; b=yGeMVUgOpTxCCB93Szb6SslJYQf98FCOGipG7rkt6Z8WeAhnnQph2MO/ierCYrKybs O3tVegVtboJx0d94HIDWFoq1UoJnyuN+J/u8AMGgOjfr4lwpJ09N6lXSs0Zw6U3Iqwq2 jbceEl50SCsr+06QPiOFutBY7nn8z/zWOpApboHlhBvrXDxe7XklMixgjas+jxujZmlg W0hrFqn5B8LKICuZMGq5UrvQyCXShk7OfM1k1eM8zCrCcU+JvrhSqEfl4b7o7eBLWNqE hqPVHXcA6nvgaPVOAVLKB22Phzirpg1cGcvOw8thvdUN6vaPyArl/ptaLbvRVz5GhYcW mFsA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AFqh2krugNjfJp8lFAXeNuxf6yr4VLiy6WyPpFYiy0StAe8aE2iETrEw yBoY+MAAAIkWYOIaolTTvFg= X-Google-Smtp-Source: AMrXdXup0G6viPjyaBF67DETFOXMd7cHPaCWp5yEazg1509jiLiFK3MXoWCwOzxVQK/lfr5MAG9AOw== X-Received: by 2002:a05:600c:2285:b0:3da:fa87:8c7 with SMTP id 5-20020a05600c228500b003dafa8708c7mr35678wmf.73.1673898746566; Mon, 16 Jan 2023 11:52:26 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:d234:0:b0:2b6:8e51:dcb with SMTP id k20-20020adfd234000000b002b68e510dcbls1073169wrh.3.-pod-prod-gmail; Mon, 16 Jan 2023 11:52:25 -0800 (PST) X-Received: by 2002:a5d:4e90:0:b0:2be:a9f:797f with SMTP id e16-20020a5d4e90000000b002be0a9f797fmr601209wru.18.1673898745762; Mon, 16 Jan 2023 11:52:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673898745; cv=none; d=google.com; s=arc-20160816; b=U3WUU4nttDIn7TKtGf2GpEQbTLomCWj04MN13wQ1H7mmcxCPnZFIuRLGonlBXvC6J4 T1TVz7Sj2uWmJajDr8FmalXX8pn5F19/B6Y/+yrkKAmy/LskGw2IRY8p+M9It9Ajosf8 +nXiuVi9uzEeoIMD5B2JudR2JYZH2xf0aOnkGWL24+mO8SLi4M0yPzRnb4ml4lxTgCR+ Y9xJHHU441ZDRPrhSY1HvYN5+KPjxTD6ba04iZkPiyyrPByJwD1Lv/45pwSl7I+wzYfG Zq3jZ8TAVUzeT60envHzkHIlvBqvH/js1e7bkL7ammnA+M9zdkq/lZd5EwTKAlQTCB62 JtHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=5aT42QIT5nwm2Co3ZV9CUeHne1s3395eXzj7q8hih+U=; b=wmTjV3GmL44M4RQOarxacfRrt4PdEb7V2igYM98qS86RkV+wu+PKIq9JxKRMTyq4uF td0/hOSAGimFlVBP3ah2h5LuVmnFeyCNrKchgYN5lo77mviuJCWoVtpRT1QSCo+cFWsz LjBqv6EKV8hKQMyuIWuBYVWoXI2wtMgquwj6cz1mU3i0+fcuZO+2AkEVZipA/jOzD5BQ t3UgqnT8jOOjbAd/8+QXZipInXcAXym561LicwAI8uI62hwWJKtPzKjvHyS+49XnN5b1 CzhT76ZyvLh4vFnG8Fr7uLPZycGti8EKzOrD+Gs+L1nbz9qcTqrtZ6lF7PczxGgov28v Epsg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Received: from bergelmir.uberspace.de (bergelmir.uberspace.de. [185.26.156.157]) by gmr-mx.google.com with ESMTPS id bw27-20020a0560001f9b00b0029c9b8d8aafsi1111180wrb.6.2023.01.16.11.52.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2023 11:52:25 -0800 (PST) Received-SPF: pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) client-ip=185.26.156.157; Received: (qmail 5719 invoked by uid 989); 16 Jan 2023 19:52:25 -0000 From: Daniel Braunwarth To: swupdate@googlegroups.com Cc: daniel@braunwarth.dev Subject: [swupdate] [PATCH 2/5] examples/client: adjust log levels Date: Mon, 16 Jan 2023 20:50:56 +0100 Message-Id: <20230116195059.25744-3-daniel@braunwarth.dev> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116195059.25744-1-daniel@braunwarth.dev> References: <20230116195059.25744-1-daniel@braunwarth.dev> MIME-Version: 1.0 X-Rspamd-Bar: ----- X-Rspamd-Report: R_MISSING_CHARSET(0.5) MIME_GOOD(-0.1) REPLY(-4) MID_CONTAINS_FROM(1) BAYES_HAM(-2.999999) X-Rspamd-Score: -5.599999 Received: from unknown (HELO unkown) (::1) by bergelmir.uberspace.de (Haraka/2.8.28) with ESMTPSA; Mon, 16 Jan 2023 20:52:25 +0100 X-Original-Sender: daniel@braunwarth.dev X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Signed-off-by: Daniel Braunwarth --- examples/client/swupdate_client.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/examples/client/swupdate_client.py b/examples/client/swupdate_client.py index 14711a6..1e597ba 100755 --- a/examples/client/swupdate_client.py +++ b/examples/client/swupdate_client.py @@ -43,9 +43,8 @@ class SWUpdater: message = "".join( filter(lambda x: x in set(string.printable), message) ) - - except Exception as err: - self._logger.warning(err) + except Exception: + self._logger.exception("Unknown exception") continue try: @@ -63,9 +62,8 @@ class SWUpdater: return True if "Installation failed" in data["text"]: return False - - except Exception as err: - self._logger.error(err) + except Exception: + self._logger.exception("Unknown exception") return False def sync_upload(self, swu_file, timeout): @@ -96,11 +94,11 @@ class SWUpdater: ) return True except ValueError: - self._logger.info("No connection to host, exit") + self._logger.error("No connection to host, exit") except FileNotFoundError: - self._logger.info("swu file not found") - except requests.exceptions.ConnectionError as e: - self._logger.info("Connection Error:\n%s", e) + self._logger.error("swu file not found") + except requests.exceptions.ConnectionError: + self._logger.exception("Connection error") return False async def start_tasks(self, timeout): @@ -115,7 +113,7 @@ class SWUpdater: try: result = await asyncio.wait_for(ws_task, timeout=timeout) except asyncio.TimeoutError: - self._logger.info("timeout!") + self._logger.error("timeout!") return False return result From patchwork Mon Jan 16 19:50:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Braunwarth X-Patchwork-Id: 1727240 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::439; helo=mail-wr1-x439.google.com; envelope-from=swupdate+bncbaabb6wvs2pamgqezktqfga@googlegroups.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=k8c7S3Q9; dkim-atps=neutral Received: from mail-wr1-x439.google.com (mail-wr1-x439.google.com [IPv6:2a00:1450:4864:20::439]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NwjNb5JMtz23h1 for ; Tue, 17 Jan 2023 06:52:30 +1100 (AEDT) Received: by mail-wr1-x439.google.com with SMTP id o11-20020adf8b8b000000b002be143c4827sf590827wra.19 for ; Mon, 16 Jan 2023 11:52:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673898747; cv=pass; d=google.com; s=arc-20160816; b=p3pyhecXO8c/IvNarqBA36BDRKt2d0C/Qb5E9urVsw10HWemv5y76jB0TrHYHTWbcV M/iF9j7mWMBpET5TBhMxhdmUZ/+m5tfjYSB6acgx/r2ZNFJ9bg9TIhP3PjqEywR3p+Q/ SLje/9CZP7MMS5nkgJYq1ZHxE+CMs4HJ/6D6h6JchqETXv55h7LyaxkM8Lm71tT5F6zl mrfiy3PW8NcRfoFy1tWFdbe3KBtGCzco302VYnap0+jokUbVp/bneltqXO0vOZtS6Scj QHXHUuzsu10OyD+zSALO2BIO/K6blu4xVJ70ekXBcetMx4+EIW88r0bZGTemJqwKuo2F 8QgA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=PL/+n/VKBx0SEGH5waywV6qM01XiOXv1GYNFL0nEKL4=; b=SfI6pTWCQJqs4yUgaisP2NokbF01XVKyiM0bUHD39I0sfsVwKbucTB6YmJBsUv4AT5 hGZ7FYRrHxGEljMlwkjrNnoKUpScH9wtMbiLBkX+NP66KncAyGcebC/IjT6TKuCYhB0s E2unurLIAujvOizci8vbkrxOOPc9XUzrgaTrkWz68Nu73fO6zUni1LfsvZXNBVSiFbX5 B4TXar9Z96EDdCl+tI1hRknKruS16HKRK09aoo5pq0HX0KvqLdC/hDaJoJYl3Bn9g2/F TEhL4fEul3/z5kwdB6g+eJAUkWqB8Yj5omirsRGNpQcGJhYsc8dXFC3/PkkvqOhSUHiD SEqQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=PL/+n/VKBx0SEGH5waywV6qM01XiOXv1GYNFL0nEKL4=; b=k8c7S3Q94pJhZn2/pD7gYT6IRz9z+wdQVGblIpyrKU3G+BY7hqTqZFY7Ay8Fzj8OwK cAbUTDpo/413P5K/xSGb4KNmcqPCEWte9o18kibkw5IxA051lOE5/tEAuZMb0Rcd5NHD BOZ2XrkcQ2sTWjIlBUoaognrpculv1fRHiGrv+HExmnO/zCwFe7WUQhXuuCrMK6UiEpt kMCVt5oZD1C2BSow/4O8dt42PF8XtZbA1C3V6YBgnNJ1m2bxWd+AtKuq/0noIBy6+Tre UtJ7xm5qO4tA0locFwjvg/LdjzHeMOGu616U8muNSp9Jw0TrrFTVlLJecdTuoykZnDFf PrIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=PL/+n/VKBx0SEGH5waywV6qM01XiOXv1GYNFL0nEKL4=; b=EY2zJgLM1WSFfianMPJfgpP6gHpPCKOgCNcy4bCGeUHJg39XDF9sW9xbksl1WE8d/C Qe2srua0oJ00cf7jRKStznOhXPRtxhtNhOCSvKa4WDaJ5lMJtlceSfkQtrimNdu0i92M ka6QOGO2/eJYE+SVV6Jvu2x/Ce6W1w20skOB6u66yOmYkwc5//m3R3/0wEZsAYVS+cQy SQW7EzbSH6obqOy/3IwYtErwP1tLzsQqratIZHra3/4k4UHn+03nPECeHz6K926fNC9j sPpilSQcUt2K9ahrG3d7OVOlBOAZk7oPtzsLVIBFl33OPmxjNDq0L+dsVBEa63t0wimu BQdQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AFqh2kpVcYi51Ihjdeqo37uyyYl4Ibuk05+Nyn5/kihl2mLLCzSJEQrE KwVcEmITjPxcLGRSdVeSqGU= X-Google-Smtp-Source: AMrXdXuZt35vXI2F470YzXIvpCs45EoZPmQCu7zeZgHAc7huLkzOFasyw9NvT2vWRPqtSKN5xogOSQ== X-Received: by 2002:a05:600c:1e01:b0:3d9:e5a6:e176 with SMTP id ay1-20020a05600c1e0100b003d9e5a6e176mr43296wmb.85.1673898746883; Mon, 16 Jan 2023 11:52:26 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1c:7708:0:b0:3d9:bb72:6814 with SMTP id t8-20020a1c7708000000b003d9bb726814ls6758266wmi.3.-pod-control-gmail; Mon, 16 Jan 2023 11:52:26 -0800 (PST) X-Received: by 2002:a05:600c:1c8b:b0:3d9:f492:f25f with SMTP id k11-20020a05600c1c8b00b003d9f492f25fmr609790wms.16.1673898746021; Mon, 16 Jan 2023 11:52:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673898746; cv=none; d=google.com; s=arc-20160816; b=MC+iLuV+C9KIxrqWzegf77u59DHjczqw1p58J6XrwypIyPYUbPDzdBo7A8oj+NzRxF PFD5mVQmTYCTcbGutYbH4diwJVQ3xxI1WBmOAcjpYUK24zTgPmm2FMj3bWLKsspZ02EH 9ujhATIQIhxyBSUuoXdUrNea9I73sV9EWlmw3SOpLl3gt7rRtjkCGIQdWwQ96Ph6oiyq WV9dknVu72y1a/lwYZOasgnmZdOeY9haSGX0KPUjvq0Y3cvzZXmKa8IuEqGogcJwt78q j2IanLKEA4CuHSAGihLwpifGoRBWMJy2xIsp2ZArVytq7NwnRstozP4wcX+ppEXUfELo 0Uwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=cDPw8H1CWlJdXnPW8LkElWS1iAoVtcl0S2mFkK98jg4=; b=gcJGgtmFmlYOM/6kr58UI8JpPNN2rLCo352Mr0UB+6nJgLy75fBVb7EvcKPbBi+7S3 UV4GC9gEXmOLC3WCziMzmtmhL60OSpeCKti2CuemO+8JkxI6Ddht9WmRACr0AlLngCEv rpSUpRJQGchLlQvqecp+5LunwyxvapTjvK+pUZfX6jRd3+cnFDbEa+nK//9xIdyBUKd6 EDzqbiU0jCny4ASVCMnnZ80QHMojdwW8QoRC+pJ40M1vxuUFH3+VWl8esBM4s29P7ba0 PN8MgZd34DGjUs2CReSfmt+l4v1tK4cCNiKu/9YEEnb4SLUvN4KSQDClbm3air4f/5eT BY0Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Received: from bergelmir.uberspace.de (bergelmir.uberspace.de. [185.26.156.157]) by gmr-mx.google.com with ESMTPS id n7-20020a05600c500700b003da2550fb5fsi484273wmr.1.2023.01.16.11.52.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2023 11:52:25 -0800 (PST) Received-SPF: pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) client-ip=185.26.156.157; Received: (qmail 5728 invoked by uid 989); 16 Jan 2023 19:52:25 -0000 From: Daniel Braunwarth To: swupdate@googlegroups.com Cc: daniel@braunwarth.dev Subject: [swupdate] [PATCH 3/5] examples/client: sort imports Date: Mon, 16 Jan 2023 20:50:57 +0100 Message-Id: <20230116195059.25744-4-daniel@braunwarth.dev> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116195059.25744-1-daniel@braunwarth.dev> References: <20230116195059.25744-1-daniel@braunwarth.dev> MIME-Version: 1.0 X-Rspamd-Bar: ----- X-Rspamd-Report: R_MISSING_CHARSET(0.5) MIME_GOOD(-0.1) REPLY(-4) MID_CONTAINS_FROM(1) BAYES_HAM(-2.999999) X-Rspamd-Score: -5.599999 Received: from unknown (HELO unkown) (::1) by bergelmir.uberspace.de (Haraka/2.8.28) with ESMTPSA; Mon, 16 Jan 2023 20:52:25 +0100 X-Original-Sender: daniel@braunwarth.dev X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Signed-off-by: Daniel Braunwarth --- examples/client/swupdate_client.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/client/swupdate_client.py b/examples/client/swupdate_client.py index 1e597ba..78e92f1 100755 --- a/examples/client/swupdate_client.py +++ b/examples/client/swupdate_client.py @@ -5,15 +5,16 @@ # SPDX-License-Identifier: GPL-2.0-only # +import argparse import asyncio import json -import requests -import websockets import logging import string -import argparse import sys +import requests +import websockets + class SWUpdater: """Python helper class for SWUpdate""" From patchwork Mon Jan 16 19:50:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Braunwarth X-Patchwork-Id: 1727242 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::240; helo=mail-lj1-x240.google.com; envelope-from=swupdate+bncbaabb66vs2pamgqer2yuqhi@googlegroups.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=WuaBo16a; dkim-atps=neutral Received: from mail-lj1-x240.google.com (mail-lj1-x240.google.com [IPv6:2a00:1450:4864:20::240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NwjNb5JD7z23gx for ; Tue, 17 Jan 2023 06:52:30 +1100 (AEDT) Received: by mail-lj1-x240.google.com with SMTP id v19-20020a2ea453000000b0028b7192e0f3sf1817568ljn.11 for ; Mon, 16 Jan 2023 11:52:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673898747; cv=pass; d=google.com; s=arc-20160816; b=Bsak6g40XVJM4mI3LJFfm0k6qC12qVbyrFAJEAIQ1gH7JQoa4A3ywSM9wILa/Mz855 O7o/seJU/0E7P4PXYdQO5cgroyHr6Q0sUt53WBh9aTB5Kg78PYIDFwrAQDpCP0wIR80W /JUc0fXGJd1j3xYlKORyXDBu9PuFYJCvYi4FoPZj8sOMW2v06ywHsVPueLiDTyCw+6jm WBP7U43aESXuroZiN0z8DfetC3VWqKYP0fYGxpB8XnS0gN93Dqti5+wYfNF8v/rMOgpX XtVdVFDmyRyyg+9umHBtC0KJIQ2Ieyh3El4A2zZXd3gKGOt/t+EX/kq8DEkHWOQ+ACnn lluA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=5s9iDsqw1eUchBPby7cFb9Nao2J/rh5+UctRqDt/amM=; b=eI72f9Q4Htr3evZpi8ESwJQPARYRVIr5jovHOofiRPOZ7rNFmC92B48WHGcDcAZfBH xX600p5xcO2H7EVm+Pegid7qerXPzX2VYLUFnBx/uAqUXW6bOq7hQvQ36lpydI2iMO/G e4TlhYx67RUzFLjifYvL9yxIjubULaDiT9zuT7NaU6ydgUAGWF1nj7I09UWMUAue0yMy LsWy919YGs7Pjhn8aLGgKuw75RREqPoKWyLNyqCuJKVuWB3hudU9nTQAKgumqW3ygTIu I1YTseAVHYIQ2ZopMdLz+oFO7Eh1hpdMAtM5Q2dsFV/1tRdZAnqtqjgUkVy6NwReVlJc 9TZw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=5s9iDsqw1eUchBPby7cFb9Nao2J/rh5+UctRqDt/amM=; b=WuaBo16a4TKcWQrHs4qdQp88en95B2AyFUME4UT0szlKY/uGf5iOMrIoszpZelMJil jjPZQADtYeBOENTUNswl9jktgpsLd2v5H70N3nI22U19m1E8shi/4jp165fyYEoaQq9F qWS9999jVPvWHAG3IHL3DsgQG17THD8+kFx1T3mBieJ7wO1xpqqGN+x98oiZfXBqw3Pq ty4kEQOnvhE4tw2dryDC5lArlIfo5vGdcL9mj9mNsVDnEyAfkqo2CG6ejrEuZgqlQuRN T/OZX2hil6VS0xRDQ31Dn+6BuIIyaksECz8cVqT94gmNcWtRiNvPW9OWmDez09oW5QeC CS3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=5s9iDsqw1eUchBPby7cFb9Nao2J/rh5+UctRqDt/amM=; b=P5vEc3tb0dmW0Hs0pwY86Mq5EIRRD1GaF30b49hF2kLQaNw/A0i7ZDUpNX5Eki10ax 3jvFKlfCqZYvTnmQj+EkVbCKdiVSpylQE959Onpt8fqlKe8hcYRpghxaLlvBhg/O7E8/ bXN3jfAFX9+w8ZmoTtO2o2Gfj8pXCcp/EFm5h+jG1q/zlqVTpWsAIHKXxRasXPbHiiWQ ggVzU1kfHKoDJ9umRlDOT73eQNwKDwzUpA4N1z08vyymfLDX9U4zolE3lFE/8RRxWtyJ mMsP8Oo42ew4ywLmkh2g70cISHM8Q4dSKDc2M8Y4GC4l9vi5HIDqKEtnSoX/aWV5ZWat QqIw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AFqh2kpmGYStZX/v9WFMOpHsKbhfNzaWzgVCTHax/50OTCXXjxjiCuWD 0Tj1Tikj2VlNo2YCAQ/mDpY= X-Google-Smtp-Source: AMrXdXsniKqHeitPeHxl4TCD/eb+Nl7hfyaUzvQa1b6/nUkKdhygaG0F8OfI6qsA04Sb17QwhdIYMg== X-Received: by 2002:ac2:511c:0:b0:4b6:e956:54a2 with SMTP id q28-20020ac2511c000000b004b6e95654a2mr14712lfb.663.1673898747441; Mon, 16 Jan 2023 11:52:27 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6512:3244:b0:4d5:7ca1:c92f with SMTP id c4-20020a056512324400b004d57ca1c92fls1623773lfr.2.-pod-prod-gmail; Mon, 16 Jan 2023 11:52:26 -0800 (PST) X-Received: by 2002:a05:6512:3e29:b0:4b5:26f3:2247 with SMTP id i41-20020a0565123e2900b004b526f32247mr89416lfv.69.1673898746490; Mon, 16 Jan 2023 11:52:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673898746; cv=none; d=google.com; s=arc-20160816; b=A4cHc4wS4uUjyOoT4L8DikvgisPlNhoZd+ak5DbWIsuBl0vewVT4PQx1GXw0RpGdGQ vSUesTS9K3CE0LlYB6uUdaK4Bjco9GWjktq5PzXxOWee7PnfA/5iMRKUNmbK4Nq384qM wZIM1NiTQ5BBiwyDI/CQmmh4cJUP/1IMbtXQyH/fsFmaiJmZGJ50UpLqjZIFqy80KeId epdKZg758cRKduumN/wf2lHNDZ66h8E5CELXrAR66bDt36S6eViuJqMaMHwb39Y0anSY OxEl9vCrKZJpEqrShLvIYCB2O17LpmsgOMGc02fHTcJrVLxQPWhPRrh/yCik4aH/ZJvr TOhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=p/kDi/k1JHAoOmlZ7tvsBgjrNckgCs95cckSot8DgWY=; b=AXjajvsjx+4kXBMKMaXZCOCzFDjgsSvvM6Ugq2l+fy6DQsWvyM3scZCMlfhGutScon FGeYme040ejfF8szYq6eVDFFumOSodUHeCBfYq1akHZcuCtBGw9/EsARHGhGJtpk2Vkz R6450eWrUGPxH5kgBRCL2gfUy2PouU1ub1pK61j7iwwvg1k4ycbYZAAB7mMAkGbIrV4w BNWjdxfOMGN15T9avqj81JXVX0wcgCylQVYKY5UZYoVGpTZlTnfG4VfGnxpDFn6M4NJQ BEWbnbF5odpg1nejoGgZKsfvOlKxgAgYj9i4L/tUtmxkdAWtangOv459bl2EMEr7UtE6 +Odw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Received: from bergelmir.uberspace.de (bergelmir.uberspace.de. [185.26.156.157]) by gmr-mx.google.com with ESMTPS id u5-20020a05651220c500b00492ce810d43si1330401lfr.10.2023.01.16.11.52.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2023 11:52:26 -0800 (PST) Received-SPF: pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) client-ip=185.26.156.157; Received: (qmail 5733 invoked by uid 989); 16 Jan 2023 19:52:25 -0000 From: Daniel Braunwarth To: swupdate@googlegroups.com Cc: daniel@braunwarth.dev Subject: [swupdate] [PATCH 4/5] examples/client: improve websocket message handling Date: Mon, 16 Jan 2023 20:50:58 +0100 Message-Id: <20230116195059.25744-5-daniel@braunwarth.dev> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116195059.25744-1-daniel@braunwarth.dev> References: <20230116195059.25744-1-daniel@braunwarth.dev> MIME-Version: 1.0 X-Rspamd-Bar: ----- X-Rspamd-Report: R_MISSING_CHARSET(0.5) MIME_GOOD(-0.1) REPLY(-4) MID_CONTAINS_FROM(1) BAYES_HAM(-2.999999) X-Rspamd-Score: -5.599999 Received: from unknown (HELO unkown) (::1) by bergelmir.uberspace.de (Haraka/2.8.28) with ESMTPSA; Mon, 16 Jan 2023 20:52:25 +0100 X-Original-Sender: daniel@braunwarth.dev X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , This patch maps the logging level used by SWUpdate to the logging levels used by Python and logs them with the actual level. Signed-off-by: Daniel Braunwarth --- examples/client/swupdate_client.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/examples/client/swupdate_client.py b/examples/client/swupdate_client.py index 78e92f1..751a268 100755 --- a/examples/client/swupdate_client.py +++ b/examples/client/swupdate_client.py @@ -16,6 +16,14 @@ import requests import websockets +LOGGING_MAPPING = { + "3": logging.ERROR, + "4": logging.WARNING, + "6": logging.INFO, + "7": logging.DEBUG, +} + + class SWUpdater: """Python helper class for SWUpdate""" @@ -58,7 +66,10 @@ class SWUpdater: if data["type"] != "message": continue - self._logger.info(data["text"]) + self._logger.log( + LOGGING_MAPPING[data["level"]], + data["text"]) + if "SWUPDATE successful" in data["text"]: return True if "Installation failed" in data["text"]: From patchwork Mon Jan 16 19:50:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Braunwarth X-Patchwork-Id: 1727241 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::537; helo=mail-ed1-x537.google.com; envelope-from=swupdate+bncbaabb6wvs2pamgqezktqfga@googlegroups.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=qPR/G2Cm; dkim-atps=neutral Received: from mail-ed1-x537.google.com (mail-ed1-x537.google.com [IPv6:2a00:1450:4864:20::537]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NwjNb5N5gz23h3 for ; Tue, 17 Jan 2023 06:52:30 +1100 (AEDT) Received: by mail-ed1-x537.google.com with SMTP id q10-20020a056402518a00b0048e5bc8cb74sf19698514edd.5 for ; Mon, 16 Jan 2023 11:52:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673898747; cv=pass; d=google.com; s=arc-20160816; b=C64H6bndcOxAp3SkGn0VeEYf+IY0rX1IC90vzyO047jhUy+n8tW5OVasV+aF1BsN9d 7etqAYJC8RzJUEVUzOWmThRWd8XRQMpRNHvdXn4pKTnM9F9jutJl9LT7dezasfcDUmT7 QNZP7eFwIj6sojs2Ltagw+yuAeRxSoGU+dje5+37yKRzdi8+5cadju2z0pttRrSjQdlt 5CEhyuPZ/eQXTmK0hsKhl1mWpeIyNmzoTWIpQYNNbbZeN9cMJi1YH7lZh1Pkoay1jShg pM5Ip+nU8ybJ3BxNuyf/p7yPtJwZAAZ1RXQJGmUMDf5Ms4SZAaO9tM0KMUHLih9A8//y Cctg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=XD1dmUveUatYLvOYqBtmUOQ8N88vCp8Cbf2z+skNS4w=; b=Tk3ENLXT3H42K5/aTxlKyoGOLH7s3iZpicVPXBI3duB6WGOTl7QxNG7vSs3LD5pG85 lIDbo9tQDpUCcbsRzzjB5tD0qIU0+WI1o7qDvVgsrpkQ9Wfz16JzcZvv8ELG6f2zXT1L gPfrok4j7SM3D0TqQmIBxHBi0GC9CripK6FsAGX1XxeMuEysxffnS4f2qbYHReFmihxT M1AbsVOB3TAe8aJgZHGtSsao6CO61JV6WM787UHxSQSJBoiOuZcvX7wE4ZUq+Iw/GUj9 bkyvUG0/5z13jsr0mrzjI1Te2we3chVPnxiuXUCjdOUNY+dzy5fOvf/lj1OI9tE9XmyD Bx/A== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=XD1dmUveUatYLvOYqBtmUOQ8N88vCp8Cbf2z+skNS4w=; b=qPR/G2Cml3ZLdCNXzHASY4qkca6AbMGN73dWW0jKhjATqQTjpHwKmp4OJsj0H70bLs /z9hVJRV6asl3IyZLueUkYbI1rSGM6VwLbfLRuQG4BkXUroci+yMLOVGP+cjzszaXb4B qr3RLhZ+ri3fmu5txK/a3ITT5P2TobeGzB0h4kWTnS/5G46EnT1z0Tiq8vXSGPcfZHAG 2HXYgLeGeih+nKOM0lUNeAagoK/geOhXGhH8inqSso5urDjASsGe7BPlKYfPPsv7922W uqbAGiincXKMmFxE0h1rhWU5N4ce0QJie6PPOPqCYj3x7lZUeMa7g/003uhUaF8JyJHM xfkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=XD1dmUveUatYLvOYqBtmUOQ8N88vCp8Cbf2z+skNS4w=; b=MILo7W170zMUvYCILb4l4Dx4oCUv501MFOoo9vQzcKBPaIAPEvMLLQW5V1PybPLr+o h6ZpqS6GJ9gnWG2c7/PvCDPj+2xDABXbNyPUlZP5PgjDGkDCJPqe2QERX07ErLvva8dd kzC0nDRaQVzJL9O0IvdsWUmEhccqKwH8G6pA5qrLVwmSxCknbwGqI2q6a4AJoEdS9slI RxcwH/i6Gma4dk3bQz6oL+2gHaxPKhG8FNindpyjmzHIjCsbAmxOe6qW+erjLlFUAlOs 9QFsk/b4txaQQ45/Sifr96w7ykmunFwptjYW4rm9l2oNYmyZYOrCdG2bExzjUH1xB9MF xEfw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AFqh2kraubb/8oeSQ+ZlM7fXs30F0KTOLZDqDBwpffLxXTqu+L/gMY49 +S+r8V0nkHG3Np9sHe2L6qo= X-Google-Smtp-Source: AMrXdXugEnDPOrq0XMmjWqvF9ggOV93vETF5g9MjK1rK+SUTpw/LoFM3dh+qC4XyzAxgR2jfKY2AZw== X-Received: by 2002:a17:906:d149:b0:828:76a3:e6be with SMTP id br9-20020a170906d14900b0082876a3e6bemr12970ejb.455.1673898747272; Mon, 16 Jan 2023 11:52:27 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6402:520a:b0:43d:b3c4:cd21 with SMTP id s10-20020a056402520a00b0043db3c4cd21ls1406891edd.2.-pod-prod-gmail; Mon, 16 Jan 2023 11:52:26 -0800 (PST) X-Received: by 2002:aa7:c946:0:b0:496:4d2f:1b4b with SMTP id h6-20020aa7c946000000b004964d2f1b4bmr11612612edt.7.1673898746438; Mon, 16 Jan 2023 11:52:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673898746; cv=none; d=google.com; s=arc-20160816; b=k82tI4mTFUIqCtFVY3DYAq3ugspfML954hnty92iA+CpAi8GevyH5fjeVpyDumvzll pp+z+SmpysoN/3DXnwlxFbtRmdG9mguxdFz/HXPHltqAW10JJ9ejTmxeNreh5Bkxc27w XUcd9gCU+4+GhjdnhKXhMBpkmlCz067FrH56mI2ug+hNsdm8gqc4xJBFphxwIKqICEyW t0h952296P6jPoAdkjGAufKEFy17pb6HH/NmlJhgxCEgRWR+g/mhqggBiXN/shhyXEJp Eljwfc9fjdhY2KeNCfVv5T980312kT5IM5GDUqe5LGDM6s/RpVnlkqsk+LoFt5ochWpV lilg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=hoK8fMnk4okelY5rtnJLu32vUnOI1T25u8lP+XFOtNc=; b=VfRefhwm0iWoDuKX7ghxwLGr9P2JU5h7LD02bqx4ds3YrmcwrIpbVeCE9swXrYy8zB LCHDN6kJQtpDem45IWJ7Oe55toy9gACCqO7Q8s17u+OKuwMZ2gkGY2UtFgY8RQ8t7SoE igoAMW9y3KryR0vKzpAHNwCvr+R1WTYfiQ19QtpfcfAGvELhG1DDwD/oYEfvPKpt19pY QxTnJOqFZ7hjrNlXQCOhqI/e3PtrtbfJlBGfIugz2ny+5g/5LyHzwJnKHzMnxKPjeknw kjfB8tFGOyilafJNKBUOCw9wfHePbIkNWwesLD0jJtKKJuLHwEFY0vulCBUFqduNNCXM 1NiA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Received: from bergelmir.uberspace.de (bergelmir.uberspace.de. [185.26.156.157]) by gmr-mx.google.com with ESMTPS id l25-20020aa7c319000000b0048ecd372fccsi1304324edq.5.2023.01.16.11.52.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2023 11:52:26 -0800 (PST) Received-SPF: pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) client-ip=185.26.156.157; Received: (qmail 5740 invoked by uid 989); 16 Jan 2023 19:52:26 -0000 From: Daniel Braunwarth To: swupdate@googlegroups.com Cc: daniel@braunwarth.dev Subject: [swupdate] [PATCH 5/5] examples/client: add colorized output Date: Mon, 16 Jan 2023 20:50:59 +0100 Message-Id: <20230116195059.25744-6-daniel@braunwarth.dev> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116195059.25744-1-daniel@braunwarth.dev> References: <20230116195059.25744-1-daniel@braunwarth.dev> MIME-Version: 1.0 X-Rspamd-Bar: ----- X-Rspamd-Report: R_MISSING_CHARSET(0.5) MIME_GOOD(-0.1) REPLY(-4) MID_CONTAINS_FROM(1) BAYES_HAM(-2.999999) X-Rspamd-Score: -5.599999 Received: from unknown (HELO unkown) (::1) by bergelmir.uberspace.de (Haraka/2.8.28) with ESMTPSA; Mon, 16 Jan 2023 20:52:26 +0100 X-Original-Sender: daniel@braunwarth.dev X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of daniel@braunwarth.dev designates 185.26.156.157 as permitted sender) smtp.mailfrom=daniel@braunwarth.dev Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Signed-off-by: Daniel Braunwarth --- examples/client/Pipfile | 1 + examples/client/swupdate_client.py | 44 ++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/examples/client/Pipfile b/examples/client/Pipfile index 8daf012..2410e25 100644 --- a/examples/client/Pipfile +++ b/examples/client/Pipfile @@ -10,6 +10,7 @@ name = "pypi" [packages] websockets = "*" requests = "*" +termcolor = "*" [dev-packages] diff --git a/examples/client/swupdate_client.py b/examples/client/swupdate_client.py index 751a268..bfd267b 100755 --- a/examples/client/swupdate_client.py +++ b/examples/client/swupdate_client.py @@ -9,10 +9,11 @@ import argparse import asyncio import json import logging +import os import string -import sys import requests +from termcolor import colored import websockets @@ -24,6 +25,31 @@ LOGGING_MAPPING = { } +class ColorFormatter(logging.Formatter): + """Custom logging formatter with colorized output""" + + COLORS = { + logging.DEBUG: "dark_grey", + logging.INFO: "black", + logging.WARNING: "yellow", + logging.ERROR: "red", + } + + ATTRIBUTES = { + logging.DEBUG: [], + logging.INFO: ["bold"], + logging.WARNING: ["bold"], + logging.ERROR: ["bold"], + } + + def format(self, record): + return logging.Formatter(colored( + "%(levelname)s:%(name)s:%(message)s", + self.COLORS[record.levelno], + attrs=self.ATTRIBUTES[record.levelno]) + ).format(record) + + class SWUpdater: """Python helper class for SWUpdate""" @@ -37,8 +63,11 @@ class SWUpdater: if logger is not None: self._logger = logger else: - logging.basicConfig(stream=sys.stdout, level=logging.INFO) + handler = logging.StreamHandler() + handler.setFormatter(ColorFormatter()) self._logger = logging.getLogger("swupdate") + self._logger.addHandler(handler) + self._logger.setLevel(logging.DEBUG) async def wait_update_finished(self): self._logger.info("Waiting for messages on websocket connection") @@ -146,7 +175,18 @@ if __name__ == "__main__": default=300, nargs="?", ) + parser.add_argument( + "--color", help="colorize messages (auto, always or never)", type=str, + metavar="[WHEN]", choices=["auto", "always", "never"], default="auto" + ) args = parser.parse_args() + + # Configure logging colors + if args.color == "always": + os.environ["FORCE_COLOR"] = "yes" + elif args.color == "never": + os.environ["NO_COLOR"] = "yes" + updater = SWUpdater(args.swu_file, args.host_name, args.port) updater.update(timeout=args.timeout)