diff --git a/proxmox-rest-server/src/h2service.rs b/proxmox-rest-server/src/h2service.rs index f5556d1a..fba9714c 100644 --- a/proxmox-rest-server/src/h2service.rs +++ b/proxmox-rest-server/src/h2service.rs @@ -33,7 +33,7 @@ impl H2Service { } pub fn debug>(&self, msg: S) { - if self.debug { self.worker.log(msg); } + if self.debug { self.worker.log_message(msg); } } fn handle_request(&self, req: Request) -> ApiResponseFuture { @@ -77,7 +77,14 @@ impl H2Service { message = &data.0; } - worker.log(format!("{} {}: {} {}: {}", method.as_str(), path, status.as_str(), reason, message)); + worker.log_message(format!( + "{} {}: {} {}: {}", + method.as_str(), + path, + status.as_str(), + reason, + message + )); } } } diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs index 1b20391a..bea43573 100644 --- a/proxmox-rest-server/src/worker_task.rs +++ b/proxmox-rest-server/src/worker_task.rs @@ -779,7 +779,7 @@ impl WorkerTask { /// Log task result, remove task from running list pub fn log_result(&self, result: &Result<(), Error>) { let state = self.create_state(result); - self.log(state.result_text()); + self.log_message(state.result_text()); WORKER_TASK_LIST.lock().unwrap().remove(&self.upid.task_id); let _ = self.setup.update_active_workers(None); @@ -787,13 +787,13 @@ impl WorkerTask { } /// Log a message. - pub fn log>(&self, msg: S) { + pub fn log_message>(&self, msg: S) { let mut data = self.data.lock().unwrap(); data.logger.log(msg); } /// Log a message as warning. - pub fn warn>(&self, msg: S) { + pub fn log_warning>(&self, msg: S) { let mut data = self.data.lock().unwrap(); data.logger.log(format!("WARN: {}", msg.as_ref())); data.warn_count += 1; @@ -815,7 +815,7 @@ impl WorkerTask { let prev_abort = self.abort_requested.swap(true, Ordering::SeqCst); if !prev_abort { // log abort one time - self.log(format!("received abort request ...")); + self.log_message(format!("received abort request ...")); } // noitify listeners let mut data = self.data.lock().unwrap(); @@ -867,11 +867,11 @@ impl WorkerTaskContext for WorkerTask { fn log(&self, level: log::Level, message: &std::fmt::Arguments) { match level { - log::Level::Error => self.warn(&message.to_string()), - log::Level::Warn => self.warn(&message.to_string()), - log::Level::Info => self.log(&message.to_string()), - log::Level::Debug => self.log(&format!("DEBUG: {}", message)), - log::Level::Trace => self.log(&format!("TRACE: {}", message)), + log::Level::Error => self.log_warning(&message.to_string()), + log::Level::Warn => self.log_warning(&message.to_string()), + log::Level::Info => self.log_message(&message.to_string()), + log::Level::Debug => self.log_message(&format!("DEBUG: {}", message)), + log::Level::Trace => self.log_message(&format!("TRACE: {}", message)), } } }