Skip to content

Commit 16cc345

Browse files
vmarcellavmarcella
committed
[update] log level names, change coloring.
1 parent b8a85c6 commit 16cc345

File tree

3 files changed

+40
-39
lines changed

3 files changed

+40
-39
lines changed

‎crates/lambda-rs-logging/src/handler.rs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ impl FileHandler {
3939
let log_message = format!("[{}]-[{:?}]: {}", timestamp, log_level, message);
4040

4141
let colored_message = match log_level {
42-
LogLevel::Trace => format!("\x1B[32m{}\x1B[0m\n", log_message),
43-
LogLevel::Debug => format!("\x1B[33m{}\x1B[0m\n", log_message),
44-
LogLevel::Info => format!("\x1B[34m{}\x1B[0m\n", log_message),
45-
LogLevel::Warn => format!("\x1B[31m{}\x1B[0m\n", log_message),
46-
LogLevel::Error => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
47-
LogLevel::Fatal => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
42+
LogLevel::TRACE => format!("\x1B[32m{}\x1B[0m\n", log_message),
43+
LogLevel::DEBUG => format!("\x1B[33m{}\x1B[0m\n", log_message),
44+
LogLevel::INFO => format!("\x1B[34m{}\x1B[0m\n", log_message),
45+
LogLevel::WARN => format!("\x1B[31m{}\x1B[0m\n", log_message),
46+
LogLevel::ERROR => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
47+
LogLevel::FATAL => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
4848
};
4949

5050
self.log_buffer.push(colored_message);
@@ -72,27 +72,27 @@ impl FileHandler {
7272

7373
impl Handler for FileHandler {
7474
fn trace(&mut self, message: String) {
75-
self.log(LogLevel::Trace, message)
75+
self.log(LogLevel::TRACE, message)
7676
}
7777

7878
fn debug(&mut self, message: String) {
79-
self.log(LogLevel::Debug, message)
79+
self.log(LogLevel::DEBUG, message)
8080
}
8181

8282
fn info(&mut self, message: String) {
83-
self.log(LogLevel::Info, message)
83+
self.log(LogLevel::INFO, message)
8484
}
8585

8686
fn warn(&mut self, message: String) {
87-
self.log(LogLevel::Warn, message)
87+
self.log(LogLevel::WARN, message)
8888
}
8989

9090
fn error(&mut self, message: String) {
91-
self.log(LogLevel::Error, message)
91+
self.log(LogLevel::ERROR, message)
9292
}
9393

9494
fn fatal(&mut self, message: String) {
95-
self.log(LogLevel::Fatal, message)
95+
self.log(LogLevel::FATAL, message)
9696
}
9797
}
9898

@@ -117,12 +117,12 @@ impl ConsoleHandler {
117117
);
118118

119119
let colored_message = match log_level {
120-
LogLevel::Trace => format!("\x1B[32m{}\x1B[0m\n", log_message),
121-
LogLevel::Debug => format!("\x1B[33m{}\x1B[0m\n", log_message),
122-
LogLevel::Info => format!("\x1B[34m{}\x1B[0m\n", log_message),
123-
LogLevel::Warn => format!("\x1B[31m{}\x1B[0m\n", log_message),
124-
LogLevel::Error => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
125-
LogLevel::Fatal => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
120+
LogLevel::TRACE => format!("\x1B[34m{}\x1B[0m\n", log_message),
121+
LogLevel::DEBUG => format!("\x1B[33m{}\x1B[0m\n", log_message),
122+
LogLevel::INFO => format!("\x1B[32m{}\x1B[0m\n", log_message),
123+
LogLevel::WARN => format!("\x1B[31m{}\x1B[0m\n", log_message),
124+
LogLevel::ERROR => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
125+
LogLevel::FATAL => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
126126
};
127127

128128
println!("{}", colored_message);
@@ -131,26 +131,26 @@ impl ConsoleHandler {
131131

132132
impl Handler for ConsoleHandler {
133133
fn trace(&mut self, message: String) {
134-
self.log(LogLevel::Trace, message);
134+
self.log(LogLevel::TRACE, message);
135135
}
136136

137137
fn debug(&mut self, message: String) {
138-
self.log(LogLevel::Debug, message);
138+
self.log(LogLevel::DEBUG, message);
139139
}
140140

141141
fn info(&mut self, message: String) {
142-
self.log(LogLevel::Info, message);
142+
self.log(LogLevel::INFO, message);
143143
}
144144

145145
fn warn(&mut self, message: String) {
146-
self.log(LogLevel::Warn, message);
146+
self.log(LogLevel::WARN, message);
147147
}
148148

149149
fn error(&mut self, message: String) {
150-
self.log(LogLevel::Error, message);
150+
self.log(LogLevel::ERROR, message);
151151
}
152152

153153
fn fatal(&mut self, message: String) {
154-
self.log(LogLevel::Fatal, message);
154+
self.log(LogLevel::FATAL, message);
155155
}
156156
}

‎crates/lambda-rs-logging/src/lib.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ pub mod handler;
1313
/// The log level for the logger.
1414
#[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy)]
1515
pub enum LogLevel {
16-
Trace,
17-
Debug,
18-
Info,
19-
Warn,
20-
Error,
21-
Fatal,
16+
TRACE,
17+
DEBUG,
18+
INFO,
19+
WARN,
20+
ERROR,
21+
FATAL,
2222
}
2323

2424
/// Logger implementation.
@@ -49,7 +49,7 @@ impl Logger {
4949

5050
/// Logs a trace message to all handlers.
5151
pub fn trace(&mut self, message: String) {
52-
if !self.compare_levels(LogLevel::Trace) {
52+
if !self.compare_levels(LogLevel::TRACE) {
5353
return;
5454
}
5555

@@ -60,7 +60,7 @@ impl Logger {
6060

6161
/// Logs a debug message to all handlers.
6262
pub fn debug(&mut self, message: String) {
63-
if !self.compare_levels(LogLevel::Debug) {
63+
if !self.compare_levels(LogLevel::DEBUG) {
6464
return;
6565
}
6666
for handler in self.handlers.iter_mut() {
@@ -70,7 +70,7 @@ impl Logger {
7070

7171
/// Logs an info message to all handlers.
7272
pub fn info(&mut self, message: String) {
73-
if !self.compare_levels(LogLevel::Info) {
73+
if !self.compare_levels(LogLevel::INFO) {
7474
return;
7575
}
7676

@@ -81,7 +81,7 @@ impl Logger {
8181

8282
/// Logs a warning to all handlers.
8383
pub fn warn(&mut self, message: String) {
84-
if !self.compare_levels(LogLevel::Warn) {
84+
if !self.compare_levels(LogLevel::WARN) {
8585
return;
8686
}
8787
for handler in self.handlers.iter_mut() {
@@ -91,7 +91,7 @@ impl Logger {
9191

9292
/// Logs an error to all handlers.
9393
pub fn error(&mut self, message: String) {
94-
if !self.compare_levels(LogLevel::Error) {
94+
if !self.compare_levels(LogLevel::ERROR) {
9595
return;
9696
}
9797

@@ -102,7 +102,7 @@ impl Logger {
102102

103103
/// Logs a fatal error to all handlers and exits the program.
104104
pub fn fatal(&mut self, message: String) {
105-
if !self.compare_levels(LogLevel::Fatal) {
105+
if !self.compare_levels(LogLevel::FATAL) {
106106
return;
107107
}
108108

‎crates/lambda-rs/src/runtimes/application.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl Runtime<(), String> for ApplicationRuntime {
156156
} = self;
157157

158158
let mut runtime_logger =
159-
Logger::new(logging::LogLevel::Trace, name.clone());
159+
Logger::new(logging::LogLevel::TRACE, name.clone());
160160
runtime_logger.add_handler(Box::new(ConsoleHandler::new(name.clone())));
161161
let mut active_render_context = Some(render_context);
162162

@@ -239,7 +239,7 @@ impl Runtime<(), String> for ApplicationRuntime {
239239
})
240240
}
241241
_ => {
242-
runtime_logger.info(
242+
runtime_logger.warn(
243243
format!("[WARN] Unhandled synthetic keyboard event: {:?}",
244244
input)
245245
);
@@ -389,14 +389,15 @@ impl Runtime<(), String> for ApplicationRuntime {
389389

390390
match mapped_event {
391391
Some(event) => {
392-
runtime_logger.debug(format!("Sending event: {:?} to all components", event));
392+
runtime_logger.trace(format!("Sending event: {:?} to all components", event));
393393

394394
for component in &mut component_stack {
395395
let event_result = component.on_event(event.clone());
396396
match event_result {
397397
Ok(_) => {}
398398
Err(e) => {
399399
let error = format!("[ERROR] A component has panicked while handling an event. {:?}", e);
400+
runtime_logger.error(error.clone());
400401
publisher.publish_event(Events::Runtime{event: RuntimeEvent::ComponentPanic{ message: error}, issued_at: Instant::now()});
401402
}
402403
}

0 commit comments

Comments
 (0)