Browse Source
Merge pull request #1067 from jjlin/log-time-fmt
Add config option for log timestamp format
pull/1069/head
Daniel García
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
8 additions and
2 deletions
-
.env.template
-
src/config.rs
-
src/main.rs
|
|
@ -44,6 +44,10 @@ |
|
|
|
## Enable extended logging, which shows timestamps and targets in the logs |
|
|
|
# EXTENDED_LOGGING=true |
|
|
|
|
|
|
|
## Timestamp format used in extended logging. |
|
|
|
## Format specifiers: https://docs.rs/chrono/latest/chrono/format/strftime |
|
|
|
# LOG_TIMESTAMP_FORMAT="%Y-%m-%d %H:%M:%S.%3f" |
|
|
|
|
|
|
|
## Logging to file |
|
|
|
## It's recommended to also set 'ROCKET_CLI_COLORS=off' |
|
|
|
# LOG_FILE=/path/to/log |
|
|
|
|
|
@ -329,6 +329,8 @@ make_config! { |
|
|
|
reload_templates: bool, true, def, false; |
|
|
|
/// Enable extended logging
|
|
|
|
extended_logging: bool, false, def, true; |
|
|
|
/// Log timestamp format
|
|
|
|
log_timestamp_format: String, true, def, "%Y-%m-%d %H:%M:%S.%3f".to_string(); |
|
|
|
/// Enable the log to output to Syslog
|
|
|
|
use_syslog: bool, false, def, false; |
|
|
|
/// Log file path
|
|
|
|
|
|
@ -130,8 +130,8 @@ fn init_logging(level: log::LevelFilter) -> Result<(), fern::InitError> { |
|
|
|
if CONFIG.extended_logging() { |
|
|
|
logger = logger.format(|out, message, record| { |
|
|
|
out.finish(format_args!( |
|
|
|
"{}[{}][{}] {}", |
|
|
|
chrono::Local::now().format("[%Y-%m-%d %H:%M:%S]"), |
|
|
|
"[{}][{}][{}] {}", |
|
|
|
chrono::Local::now().format(&CONFIG.log_timestamp_format()), |
|
|
|
record.target(), |
|
|
|
record.level(), |
|
|
|
message |
|
|
|