experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added clicon_log_init(.., CLICON_LOG_FILE) option and clicon_log_file() for c\

Browse source 
ases where neither syslog or stderr is useful.
This commit is contained in:
Olof Hagsand 2018-07-26 20:13:02 +02:00
parent 156660419e
commit 5164db3603
10 changed files with 75 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

41
lib/src/clixon_log.c
View file

@ -66,8 +66,8 @@ static int _logflags = 0x0;
static clicon_log_notify_t *_log_notify_cb = NULL;
static void *_log_notify_arg = NULL;
/* Set to open file to bypass logging and write debug messages directly to file */
static FILE *_debugfile = NULL;
/* Set to open file to write debug messages directly to file */
static FILE *_logfile = NULL;
/*! Initialize system logger.
*
@ -97,6 +97,31 @@ clicon_log_init(char *ident,
return 0;
}
int
clicon_log_exit(void)
{
if (_logfile)
fclose(_logfile);
return 0;
}
/* If log flags include CLICON_LOG_FILE, set the file
* @param[in] filename File to log to
* @retval 0 OK
* @retval -1 Error
*/
int
clicon_log_file(char *filename)
{
if (_logfile)
fclose(_logfile);
if ((_logfile = fopen(filename, "a")) == NULL){
fprintf(stderr, "fopen: %s\n", strerror(errno)); /* dont use clicon_err here due to recursion */
return -1;
}
return 0;
}
int
clicon_get_logflags(void)
{
@ -183,6 +208,10 @@ clicon_log_str(int level,
flogtime(stdout);
fprintf(stdout, "%s\n", msg);
}
if ((_logflags & CLICON_LOG_FILE) && _logfile){
flogtime(_logfile);
fprintf(_logfile, "%s\n", msg);
}
if (_log_notify_cb){
static int cb = 0;
char *d, *msg2;
@ -326,13 +355,7 @@ clicon_debug(int dbglevel,
goto done;
}
va_end(args);
if (_debugfile != NULL){ /* Bypass syslog altogether */
/* XXX: Here use date sub-routine as found in err_print1 */
flogtime(_debugfile);
fprintf(_debugfile, "%s\n", msg);
}
else
clicon_log_str(LOG_DEBUG, msg);
clicon_log_str(LOG_DEBUG, msg);
retval = 0;
done:
if (msg)