From patchwork Tue Mar 22 03:47:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Heading X-Patchwork-Id: 5379 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KMyCz41JGz3xqb for ; Tue, 22 Mar 2022 03:49:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KMyCV5r6lz5Vh; Tue, 22 Mar 2022 03:49:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KMyBW3L3Sz2yTV; Tue, 22 Mar 2022 03:48:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KMyBS4xqBz2yTV for ; Tue, 22 Mar 2022 03:48:16 +0000 (UTC) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4KMyBS3FMrz1TN for ; Tue, 22 Mar 2022 03:48:16 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id DDC1C3200973; Mon, 21 Mar 2022 23:48:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 21 Mar 2022 23:48:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajrh.net; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=mesmtp; bh=CjdEPJ6Q9ykHcaJ8/n4aBZ2yhhe 7ZCOs37Gbdx8iHxY=; b=jF4inFk2mUvBwL5VugK976myBuWUJvz7YSbpI5x5jL+ DbVvxzks4ftow1dT4SqiLVC55c16EOdO/219wMFDWrRF2aTIEi4tahmGi3rxznLT +V9yOIKgfUw7bFTxqcVyg2vYTS1GJ82dw9htrGL1H/7mTrX3ztuwIPAFK9Ds7HEQ = DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=CjdEPJ 6Q9ykHcaJ8/n4aBZ2yhhe7ZCOs37Gbdx8iHxY=; b=bKGPQrgJAQ563wTQRO7KB1 yK13LypoMKO/B+Ts/ZJMQzzKhwmvd5llxhtZZorLnr90zLdgnD6aGD4hA8UfIfH7 Lt+XCdqrC3O1aBzPO0aRrUbSUvs3ye7DSLEe/XCSIVlo9inlHFq/yATCCN/0wphK dY32xeAg12EomXtLhOvGCmLywQp1Ln+iiJX7FY5Xnx2V8pNBQ8NbeD9oUyRzME8K pVoJyBdP7eOFZPVG37ikJA1lpXKfw6/vy8a42wEDjcJsFtUVBAU0Uk55Rpf2Y0D+ 1Wdxormgt7YzGKe1MupVifIWJOJRNbjtNuXhL1mCm1N2ozvBDVaP5XeChvPxrXRQ == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudeggedgieduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehnthhhohhnhicujfgvrgguihhnghcuoegrjhhrhhesrghj rhhhrdhnvghtqeenucggtffrrghtthgvrhhnpeehgfdvueetheelueevfefhueejkeeuvd ehudffveegfffhvdefudfftdehheefgeenucffohhmrghinhepshhplhhithdrphgrrhht shenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrjh hrhhesrghjrhhhrdhnvght X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 21 Mar 2022 23:48:14 -0400 (EDT) From: Anthony Heading To: development@lists.ipfire.org Subject: [PATCH 3/3] unbound-dhcp-leases-bridge : minor logging improvements Date: Mon, 21 Mar 2022 23:47:56 -0400 Message-Id: <20220322034756.36327-3-ajrh@ajrh.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220322034756.36327-1-ajrh@ajrh.net> References: <20220322034756.36327-1-ajrh@ajrh.net> MIME-Version: 1.0 ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1647920896; a=rsa-sha256; cv=none; b=UY/V+9SbnLuWYKL9k25FSq9nLV0w2nC5kCtz7plvyJy5x2mgV1HbbwuQCcekx0TX8KpZzI KUsutnMBZmVxI1n31PatQuN1BiK1dtLOxUyBwr/a+UXslyozDO0xLNiOeEWbxOy7f/TCP7 KhX5XfLuYV2IZko+19Y7cf4lfrsjQDZ266xQTfm1YcTDjfqvvL5G9qhORK5Xn0VvUUt9Ca PAIQ3RoOeYC2C3H7kKAQWMOtzDbiuKsDCGaR4NLr9lmU9CrA+5GN+BVc76V2n3CucIOZry eLEP+zHJfA8lzWQMmtiKB+IPGxZyxWOl3fboY8hBU9nRTcuCwWfYHYHi/jB9TQ== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=ajrh.net header.s=mesmtp header.b=jF4inFk2; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=bKGPQrgJ; dmarc=none; spf=pass (mail01.ipfire.org: domain of ajrh@ajrh.net designates 64.147.123.25 as permitted sender) smtp.mailfrom=ajrh@ajrh.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1647920896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CjdEPJ6Q9ykHcaJ8/n4aBZ2yhhe7ZCOs37Gbdx8iHxY=; b=sTk7QaXuiEhYD1IpPWnqFpnVPMyinuhqFKNsQf6mI57anQ2rbp+6AyHcX1ZeFuYHk78n0T Yu111t785qIyYhVWAvom8y6ekLXuuF/ftY+OilpypFBe31zATLoh9OE6fKgX40Lr3IJCf3 RJxBam7RzamfV5geMscJ4Gp5E6x206V7HSJe5gVV2gmpW15GQuFZwU2cH7KXM7SK1p+x1B dmgBQphvEXTROEFn/ogRUA5/k0pmZdXxJPQ0/lP4FLRy+pVwRKihaflJdowzlbmK/+dyTe nPusb46pyqMezGFNvTwQ0IUJQ3i405hwqEG6DE6wXBpPxY8u8X72mfAWzDZBbA== Authentication-Results: mail01.ipfire.org; dkim=pass header.d=ajrh.net header.s=mesmtp header.b=jF4inFk2; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=bKGPQrgJ; dmarc=none; spf=pass (mail01.ipfire.org: domain of ajrh@ajrh.net designates 64.147.123.25 as permitted sender) smtp.mailfrom=ajrh@ajrh.net X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-4.12 / 11.00]; BAYES_HAM(-3.00)[99.98%]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.25:c]; R_DKIM_ALLOW(-0.20)[ajrh.net:s=mesmtp,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.25:from]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; IP_REPUTATION_HAM(-0.01)[asn: 29838(0.00), country: US(-0.01), ip: 64.147.123.25(0.00)]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[ajrh.net]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US]; RWL_MAILSPIKE_EXCELLENT(0.00)[64.147.123.25:from]; RCPT_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[ajrh.net:+,messagingengine.com:+]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 4KMyBS3FMrz1TN X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Minor tweaks to logging which were helpful while debugging, including logging to stderr when running in foreground. --- unbound-dhcp-leases-bridge | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git unbound-dhcp-leases-bridge unbound-dhcp-leases-bridge index 814cf0c..17a00f6 100644 --- unbound-dhcp-leases-bridge +++ unbound-dhcp-leases-bridge @@ -26,6 +26,7 @@ import ipaddress import logging import logging.handlers import os +import sys import re import signal import stat @@ -36,22 +37,21 @@ import inotify.adapters LOCAL_TTL = 60 +log = logging.getLogger("dhcp-bridge") + def setup_logging(loglevel=logging.INFO): - log = logging.getLogger("dhcp") log.setLevel(loglevel) - - handler = logging.handlers.SysLogHandler(address="/dev/log", facility="daemon") + if args.daemon: + handler = logging.handlers.SysLogHandler(address="/dev/log", facility="daemon") + else: + handler = logging.StreamHandler(sys.stderr) handler.setLevel(loglevel) - formatter = logging.Formatter("%(name)s[%(process)d]: %(message)s") + formatter = logging.Formatter("%(name)s: %(message)s") handler.setFormatter(formatter) log.addHandler(handler) - return log - -log = logging.getLogger("dhcp") - def ip_address_to_reverse_pointer(address): parts = address.split(".") parts.reverse() @@ -602,7 +602,7 @@ if __name__ == "__main__": bridge = UnboundDHCPLeasesBridge(args.dhcp_leases, args.fix_leases, args.unbound_leases, args.hosts) - ctx = daemon.DaemonContext(detach_process=args.daemon) + ctx = daemon.DaemonContext(detach_process=args.daemon, stderr=(None if args.daemon else sys.stderr)) ctx.signal_map = { signal.SIGHUP : bridge.update_dhcp_leases, signal.SIGTERM : bridge.terminate,