faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

logging: don't write fatal messages to invalid descriptor

Browse source 
If opening the log file specified with the -l option failed (after
closing all descriptors), the error message is written to an invalid
descriptor as no log file or syslog is opened yet. Fix the code to track
when the output is usable.
This commit is contained in:
Miroslav Lichvar 2018-02-21 12:40:53 +01:00
parent 4da9f74d24
commit 7b98443a13
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
logging.c
View file

@ -79,11 +79,11 @@ LOG_Initialise(void)
void void
LOG_Finalise(void) LOG_Finalise(void)
{ {
if (system_log) { if (system_log)
closelog(); closelog();
} else {
if (file_log)
fclose(file_log); fclose(file_log);
}
LOG_CycleLogFiles(); LOG_CycleLogFiles();
@ -116,7 +116,7 @@ static void log_message(int fatal, LOG_Severity severity, const char *message)
assert(0); assert(0);
} }
syslog(priority, fatal ? "Fatal error : %s" : "%s", message); syslog(priority, fatal ? "Fatal error : %s" : "%s", message);
} else { } else if (file_log) {
fprintf(file_log, fatal ? "Fatal error : %s\n" : "%s\n", message); fprintf(file_log, fatal ? "Fatal error : %s\n" : "%s\n", message);
} }
} }
@ -134,7 +134,7 @@ void LOG_Message(LOG_Severity severity,
time_t t; time_t t;
struct tm stm; struct tm stm;
if (!system_log) { if (!system_log && file_log) {
/* Don't clutter up syslog with timestamps and internal debugging info */ /* Don't clutter up syslog with timestamps and internal debugging info */
time(&t); time(&t);
stm = *gmtime(&t); stm = *gmtime(&t);
@ -160,16 +160,14 @@ void LOG_Message(LOG_Severity severity,
case LOGS_FATAL: case LOGS_FATAL:
log_message(1, severity, buf); log_message(1, severity, buf);
/* With syslog, send the message also to the grandparent /* Send the message also to the foreground process if it is
process or write it to stderr if not detached */ still running, or stderr if it is still open */
if (system_log) { if (parent_fd > 0) {
if (parent_fd > 0) { if (write(parent_fd, buf, strlen(buf) + 1) < 0)
if (write(parent_fd, buf, strlen(buf) + 1) < 0) ; /* Not much we can do here */
; /* Not much we can do here */ } else if (system_log && parent_fd == 0) {
} else if (parent_fd == 0) { system_log = 0;
system_log = 0; log_message(1, severity, buf);
log_message(1, severity, buf);
}
} }
break; break;
default: default:
@ -220,6 +218,8 @@ void
LOG_SetParentFd(int fd) LOG_SetParentFd(int fd)
{ {
parent_fd = fd; parent_fd = fd;
if (file_log == stderr)
file_log = NULL;
} }
/* ================================================== */ /* ================================================== */

2
logging.h
View file

@ -105,7 +105,7 @@ extern void LOG_OpenFileLog(const char *log_file);
/* Log messages to syslog instead of stderr */ /* Log messages to syslog instead of stderr */
extern void LOG_OpenSystemLog(void); extern void LOG_OpenSystemLog(void);
/* Send fatal message also to the foreground process */ /* Stop using stderr and send fatal message to the foreground process */
extern void LOG_SetParentFd(int fd); extern void LOG_SetParentFd(int fd);
/* Close the pipe to the foreground process so it can exit */ /* Close the pipe to the foreground process so it can exit */