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

logging: extend functionality

Browse source 
Add a function to get the current minimum severity and a function to set
a global prefix for debug messages in order to identify messages from
helpers.
This commit is contained in:
Miroslav Lichvar 2020-07-16 13:16:15 +02:00
parent 2bb0769516
commit 51d77d6cfc
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
logging.c
View file

@ -33,6 +33,7 @@
#include "conf.h" #include "conf.h"
#include "logging.h" #include "logging.h"
#include "memory.h"
#include "util.h" #include "util.h"
/* This is used by DEBUG_LOG macro */ /* This is used by DEBUG_LOG macro */
@ -61,12 +62,16 @@ static int n_filelogs = 0;
static struct LogFile logfiles[MAX_FILELOGS]; static struct LogFile logfiles[MAX_FILELOGS];
/* Global prefix for debug messages */
static char *debug_prefix;
/* ================================================== */ /* ================================================== */
/* Init function */ /* Init function */
void void
LOG_Initialise(void) LOG_Initialise(void)
{ {
debug_prefix = Strdup("");
initialised = 1; initialised = 1;
LOG_OpenFileLog(NULL); LOG_OpenFileLog(NULL);
} }
@ -85,6 +90,8 @@ LOG_Finalise(void)
LOG_CycleLogFiles(); LOG_CycleLogFiles();
Free(debug_prefix);
initialised = 0; initialised = 0;
} }
@ -132,6 +139,8 @@ void LOG_Message(LOG_Severity severity,
time_t t; time_t t;
struct tm *tm; struct tm *tm;
assert(initialised);
if (!system_log && file_log && severity >= log_min_severity) { if (!system_log && file_log && severity >= log_min_severity) {
/* 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);
@ -142,7 +151,7 @@ void LOG_Message(LOG_Severity severity,
} }
#if DEBUG > 0 #if DEBUG > 0
if (log_min_severity <= LOGS_DEBUG) if (log_min_severity <= LOGS_DEBUG)
fprintf(file_log, "%s:%d:(%s) ", filename, line_number, function_name); fprintf(file_log, "%s%s:%d:(%s) ", debug_prefix, filename, line_number, function_name);
#endif #endif
} }
@ -220,6 +229,23 @@ void LOG_SetMinSeverity(LOG_Severity severity)
/* ================================================== */ /* ================================================== */
LOG_Severity
LOG_GetMinSeverity(void)
{
return log_min_severity;
}
/* ================================================== */
void
LOG_SetDebugPrefix(const char *prefix)
{
Free(debug_prefix);
debug_prefix = Strdup(prefix);
}
/* ================================================== */
void void
LOG_SetParentFd(int fd) LOG_SetParentFd(int fd)
{ {

6
logging.h
View file

@ -97,6 +97,12 @@ extern void LOG_Message(LOG_Severity severity, const char *format, ...);
prefixed with the filename, line number, and function name. */ prefixed with the filename, line number, and function name. */
extern void LOG_SetMinSeverity(LOG_Severity severity); extern void LOG_SetMinSeverity(LOG_Severity severity);
/* Get the minimum severity */
extern LOG_Severity LOG_GetMinSeverity(void);
/* Set a prefix for debug messages */
extern void LOG_SetDebugPrefix(const char *prefix);
/* Log messages to a file instead of stderr, or stderr again if NULL */ /* Log messages to a file instead of stderr, or stderr again if NULL */
extern void LOG_OpenFileLog(const char *log_file); extern void LOG_OpenFileLog(const char *log_file);