From 46f322c10f1f7f9d41c565b47574bdcdb4b93bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 21 Dec 2024 17:15:38 +0100 Subject: [PATCH] logger: fix path displayed when the logs directory can not be created --- CHANGELOG.md | 1 + src/plugins/logger/logger-buffer.c | 8 -------- src/plugins/logger/logger.c | 8 ++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a44b574d..f43b9f9ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Fixed +- logger: fix path displayed when the logs directory can not be created - perl: fix build with Perl < 5.7.29 ([#2219](https://github.com/weechat/weechat/issues/2219), [#2220](https://github.com/weechat/weechat/issues/2220)) ## Version 4.5.0 (2024-12-15) diff --git a/src/plugins/logger/logger-buffer.c b/src/plugins/logger/logger-buffer.c index d4911cb01..44a09e55e 100644 --- a/src/plugins/logger/logger-buffer.c +++ b/src/plugins/logger/logger-buffer.c @@ -265,15 +265,7 @@ logger_buffer_create_log_file (struct t_logger_buffer *logger_buffer) /* create directory */ if (!logger_create_directory ()) - { - weechat_printf_date_tags ( - NULL, 0, "no_log", - _("%s%s: unable to create directory for logs " - "(\"%s\")"), - weechat_prefix ("error"), LOGGER_PLUGIN_NAME, - weechat_config_string (logger_config_file_path)); return 0; - } if (!logger_buffer->log_filename) logger_buffer_set_log_filename (logger_buffer); if (!logger_buffer->log_filename) diff --git a/src/plugins/logger/logger.c b/src/plugins/logger/logger.c index d9608a3cc..3b871edb1 100644 --- a/src/plugins/logger/logger.c +++ b/src/plugins/logger/logger.c @@ -182,7 +182,15 @@ logger_create_directory () if (file_path) { if (!weechat_mkdir_parents (file_path, 0700)) + { + weechat_printf_date_tags ( + NULL, 0, "no_log", + _("%s%s: unable to create directory for logs " + "(\"%s\")"), + weechat_prefix ("error"), LOGGER_PLUGIN_NAME, + file_path); rc = 0; + } free (file_path); } else