proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-10-04 21:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup worker task logging

Browse Source 
In order to avoid name conflicts with WorkerTaskContext

- renamed WorkerTask::log to WorkerTask::log_message

Note: Methods have different fuction signatures

Also renamed WorkerTask::warn to WorkerTask::log_warning for
consistency reasons.

Use the task_log!() and task_warn!() macros more often.
This commit is contained in:
Dietmar Maurer 2021-09-24 09:30:00 +02:00
parent 7a4bb6000e
commit 020c8e6980
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
proxmox-rest-server/src/h2service.rs
View File

@ -33,7 +33,7 @@ impl <E: RpcEnvironment + Clone> H2Service<E> {
} }
pub fn debug<S: AsRef<str>>(&self, msg: S) { pub fn debug<S: AsRef<str>>(&self, msg: S) {
if self.debug { self.worker.log(msg); } if self.debug { self.worker.log_message(msg); }
} }
fn handle_request(&self, req: Request<Body>) -> ApiResponseFuture { fn handle_request(&self, req: Request<Body>) -> ApiResponseFuture {
@ -77,7 +77,14 @@ impl <E: RpcEnvironment + Clone> H2Service<E> {
message = &data.0; 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
));
} }
} }
} }

18
proxmox-rest-server/src/worker_task.rs
View File

@ -779,7 +779,7 @@ impl WorkerTask {
/// Log task result, remove task from running list /// Log task result, remove task from running list
pub fn log_result(&self, result: &Result<(), Error>) { pub fn log_result(&self, result: &Result<(), Error>) {
let state = self.create_state(result); 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); WORKER_TASK_LIST.lock().unwrap().remove(&self.upid.task_id);
let _ = self.setup.update_active_workers(None); let _ = self.setup.update_active_workers(None);
@ -787,13 +787,13 @@ impl WorkerTask {
} }
/// Log a message. /// Log a message.
pub fn log<S: AsRef<str>>(&self, msg: S) { pub fn log_message<S: AsRef<str>>(&self, msg: S) {
let mut data = self.data.lock().unwrap(); let mut data = self.data.lock().unwrap();
data.logger.log(msg); data.logger.log(msg);
} }
/// Log a message as warning. /// Log a message as warning.
pub fn warn<S: AsRef<str>>(&self, msg: S) { pub fn log_warning<S: AsRef<str>>(&self, msg: S) {
let mut data = self.data.lock().unwrap(); let mut data = self.data.lock().unwrap();
data.logger.log(format!("WARN: {}", msg.as_ref())); data.logger.log(format!("WARN: {}", msg.as_ref()));
data.warn_count += 1; data.warn_count += 1;
@ -815,7 +815,7 @@ impl WorkerTask {
let prev_abort = self.abort_requested.swap(true, Ordering::SeqCst); let prev_abort = self.abort_requested.swap(true, Ordering::SeqCst);
if !prev_abort { // log abort one time if !prev_abort { // log abort one time
self.log(format!("received abort request ...")); self.log_message(format!("received abort request ..."));
} }
// noitify listeners // noitify listeners
let mut data = self.data.lock().unwrap(); 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) { fn log(&self, level: log::Level, message: &std::fmt::Arguments) {
match level { match level {
log::Level::Error => self.warn(&message.to_string()), log::Level::Error => self.log_warning(&message.to_string()),
log::Level::Warn => self.warn(&message.to_string()), log::Level::Warn => self.log_warning(&message.to_string()),
log::Level::Info => self.log(&message.to_string()), log::Level::Info => self.log_message(&message.to_string()),
log::Level::Debug => self.log(&format!("DEBUG: {}", message)), log::Level::Debug => self.log_message(&format!("DEBUG: {}", message)),
log::Level::Trace => self.log(&format!("TRACE: {}", message)), log::Level::Trace => self.log_message(&format!("TRACE: {}", message)),
} }
} }
} }