From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 788671FF161
for <inbox@lore.proxmox.com>; Tue, 10 Sep 2024 15:03:58 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id ADD3935C9D;
Tue, 10 Sep 2024 15:03:57 +0200 (CEST)
From: Gabriel Goller <g.goller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Tue, 10 Sep 2024 15:03:51 +0200
Message-Id: <20240910130351.396746-1-g.goller@proxmox.com>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.045 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [lib.rs]
Subject: [pbs-devel] [PATCH] log: fallback to stderr if syslog not available
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
Don't panic when the syslog is not available - which happens commonly in
containers and sbuild environments (chroot and unshare) - instead
fallback to stderr.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
Note: this fixes `make sbuild` for pve-storage.
Disclaimer: haven't quite figured out why tbh, I don't see where the
verify_api function calls proxmox-backup-api or proxmox-backup-proxy.
proxmox-log/src/lib.rs | 42 +++++++++++++++++++++++++++++++-----------
1 file changed, 31 insertions(+), 11 deletions(-)
diff --git a/proxmox-log/src/lib.rs b/proxmox-log/src/lib.rs
index 0cf5cb7a50b2..27d0b8a23e91 100644
--- a/proxmox-log/src/lib.rs
+++ b/proxmox-log/src/lib.rs
@@ -50,8 +50,7 @@ pub fn init_logger(
}
let registry = tracing_subscriber::registry()
.with(
- tracing_journald::layer()
- .expect("Unable to open syslog")
+ journald_or_stderr_layer()
.with_filter(filter_fn(|metadata| {
!LogContext::exists() || *metadata.level() >= Level::ERROR
}))
@@ -127,6 +126,35 @@ impl LogContext {
}
}
+fn journald_or_stderr_layer<S>() -> Box<dyn tracing_subscriber::Layer<S> + Send + Sync>
+where
+ S: tracing::Subscriber,
+ S: for<'a> tracing_subscriber::registry::LookupSpan<'a>,
+{
+ match tracing_journald::layer() {
+ Ok(layer) => layer.boxed(),
+ Err(err) => {
+ eprintln!("Unable to open syslog: {err:?}");
+ plain_stderr_layer().boxed()
+ }
+ }
+}
+
+fn plain_stderr_layer<S>() -> impl tracing_subscriber::Layer<S>
+where
+ S: tracing::Subscriber,
+ S: for<'a> tracing_subscriber::registry::LookupSpan<'a>,
+{
+ let format = tracing_subscriber::fmt::format()
+ .with_level(false)
+ .without_time()
+ .with_target(false)
+ .compact();
+ tracing_subscriber::fmt::layer()
+ .event_format(format)
+ .with_writer(std::io::stderr)
+}
+
/// Initialize default logger for CLI binaries
pub fn init_cli_logger(
env_var_name: &str,
@@ -144,17 +172,9 @@ pub fn init_cli_logger(
}
}
- let format = tracing_subscriber::fmt::format()
- .with_level(false)
- .without_time()
- .with_target(false)
- .compact();
-
let registry = tracing_subscriber::registry()
.with(
- tracing_subscriber::fmt::layer()
- .event_format(format)
- .with_writer(std::io::stderr)
+ plain_stderr_layer()
.with_filter(filter_fn(|metadata| {
!LogContext::exists() || *metadata.level() >= Level::ERROR
}))
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel