From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C453199DAE for ; Wed, 11 Oct 2023 16:01:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A78259F2A for ; Wed, 11 Oct 2023 16:01:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 11 Oct 2023 16:01:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8A4CD44A1B for ; Wed, 11 Oct 2023 16:01:06 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Wed, 11 Oct 2023 16:01:00 +0200 Message-Id: <20231011140102.273423-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.356 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [RFC proxmox-backup 0/2] Tasklog rewrite with tracing X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Oct 2023 14:01:08 -0000 Removed the task_log! (and friends task_warn!, task_debug!, etc.) macro and introduced the `tracing` crate. We now initiate the tracing crate using two Layers, first the syslog layer (using the `syslog` crate) and the `file_layer`. The file_layer uses the original `FileLogger`. To write to the task logs from the worker threads and tasks, we now have a task_local logger (and warning counter) in the file_layer, which will get instantiated when a task/thread is created. This means that when we call `info!` or any other `tracing` log macros (with the "tasklog" attribute), it will get the file_logger from TLS and write to the file. Gabriel Goller (1): log: removed task_log! macro and moved to tracing Cargo.toml | 61 ++++--- pbs-api-types/src/metrics.rs | 1 - pbs-api-types/src/node.rs | 3 +- pbs-datastore/Cargo.toml | 1 + pbs-datastore/src/chunk_store.rs | 33 ++-- pbs-datastore/src/datastore.rs | 101 ++++++----- src/api2/admin/datastore.rs | 29 +-- src/api2/admin/metrics.rs | 2 +- src/api2/config/acme.rs | 23 ++- src/api2/config/datastore.rs | 15 +- src/api2/node/apt.rs | 13 +- src/api2/node/certificates.rs | 69 +++---- src/api2/node/disks/directory.rs | 16 +- src/api2/node/disks/mod.rs | 6 +- src/api2/node/disks/zfs.rs | 32 ++-- src/api2/node/mod.rs | 11 +- src/api2/pull.rs | 27 ++- src/api2/tape/backup.rs | 82 ++++----- src/api2/tape/drive.rs | 158 +++++++++-------- src/api2/tape/restore.rs | 296 ++++++++++++++++--------------- src/backup/verify.rs | 108 +++++------ src/bin/proxmox-backup-api.rs | 10 +- src/bin/proxmox-backup-proxy.rs | 45 ++--- src/server/gc_job.rs | 9 +- src/server/prune_job.rs | 31 ++-- src/server/pull.rs | 192 +++++++++----------- src/server/realm_sync_job.rs | 37 ++-- src/server/verify_job.rs | 13 +- src/tape/drive/mod.rs | 37 ++-- src/tape/pool_writer/mod.rs | 90 +++++----- tests/worker-task-abort.rs | 9 +- 31 files changed, 764 insertions(+), 796 deletions(-) Gabriel Goller (1): proxmox-log: added tracing infra Cargo.toml | 6 + proxmox-log/Cargo.toml | 23 ++++ proxmox-log/debian/changelog | 5 + proxmox-log/debian/control | 53 +++++++++ proxmox-log/debian/copyright | 18 +++ proxmox-log/debian/debcargo.toml | 7 ++ proxmox-log/src/file_layer.rs | 89 +++++++++++++++ .../src/file_logger.rs | 2 +- proxmox-log/src/lib.rs | 36 ++++++ proxmox-log/src/syslog_layer.rs | 78 +++++++++++++ proxmox-rest-server/Cargo.toml | 2 + proxmox-rest-server/src/api_config.rs | 3 +- proxmox-rest-server/src/lib.rs | 3 - proxmox-rest-server/src/rest.rs | 4 +- proxmox-rest-server/src/worker_task.rs | 108 ++++++++++-------- proxmox-router/Cargo.toml | 2 + proxmox-sys/src/worker_task_context.rs | 47 -------- 17 files changed, 382 insertions(+), 104 deletions(-) create mode 100644 proxmox-log/Cargo.toml create mode 100644 proxmox-log/debian/changelog create mode 100644 proxmox-log/debian/control create mode 100644 proxmox-log/debian/copyright create mode 100644 proxmox-log/debian/debcargo.toml create mode 100644 proxmox-log/src/file_layer.rs rename {proxmox-rest-server => proxmox-log}/src/file_logger.rs (98%) create mode 100644 proxmox-log/src/lib.rs create mode 100644 proxmox-log/src/syslog_layer.rs -- 2.39.2