Skip to content

Commit cf82b94

Browse files
authored
Merge pull request #2834 from pi-hole/fix/preserve-log-path-on-fopen-failure
Preserve log file path config when fopen fails
2 parents d35f22d + 32e3d66 commit cf82b94

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/log.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "gc.h"
3131

3232
static bool print_log = true, print_stdout = true;
33+
static bool ftl_log_available = true;
3334
static const char *process = "";
3435
bool debug_flags[DEBUG_MAX] = { false };
3536

@@ -56,8 +57,10 @@ void init_FTL_log(const char *name)
5657
printf("ERROR: Opening of FTL log (%s) failed: %s\nUsing syslog instead!\n",
5758
config.files.log.ftl.v.s, strerror(errno));
5859
syslog(LOG_ERR, "Opening of FTL\'s log file failed, using syslog instead!");
59-
config.files.log.ftl.v.s = NULL;
60+
ftl_log_available = false;
6061
}
62+
else
63+
ftl_log_available = true;
6164

6265
// Close log file
6366
if(logfile != NULL)
@@ -294,7 +297,7 @@ void __attribute__ ((format (printf, 3, 4))) _FTL_log(const int priority, const
294297
add_to_fifo_buffer(FIFO_FTL, buffer, prio, len > MAX_MSG_FIFO ? MAX_MSG_FIFO : len);
295298

296299
bool logged = false;
297-
if(config.files.log.ftl.v.s != NULL)
300+
if(ftl_log_available && config.files.log.ftl.v.s != NULL)
298301
{
299302
// Open log file
300303
FILE *logfile = fopen(config.files.log.ftl.v.s, "a+");

0 commit comments

Comments
 (0)