oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

log: moved code to log_init_file()

Browse Source 
Added log_init_file() and log_init_stdout(), preparing for other
logging targets.
This commit is contained in:
Max Kellermann 2008-12-28 19:48:53 +01:00
parent d70c2e2285
commit c6cb611065
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/log.c
View File

@ -64,9 +64,9 @@ static const char *log_date(void)
} }
static void static void
mpd_log_func(const gchar *log_domain, file_log_func(const gchar *log_domain,
G_GNUC_UNUSED GLogLevelFlags log_level, G_GNUC_UNUSED GLogLevelFlags log_level,
const gchar *message, G_GNUC_UNUSED gpointer user_data) const gchar *message, G_GNUC_UNUSED gpointer user_data)
{ {
char *converted; char *converted;
@ -93,6 +93,12 @@ mpd_log_func(const gchar *log_domain,
g_free(converted); g_free(converted);
} }
static void
log_init_stdout(void)
{
g_log_set_default_handler(file_log_func, NULL);
}
static int static int
open_log_file(void) open_log_file(void)
{ {
@ -101,6 +107,18 @@ open_log_file(void)
return open(out_filename, O_CREAT | O_WRONLY | O_APPEND, 0666); return open(out_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);
} }
static void
log_init_file(const char *path, unsigned line)
{
out_filename = path;
out_fd = open_log_file();
if (out_fd < 0)
FATAL("problem opening log file \"%s\" (config line %u) for "
"writing\n", path, line);
g_log_set_default_handler(file_log_func, NULL);
}
static inline GLogLevelFlags static inline GLogLevelFlags
parse_log_level(const char *value, unsigned line) parse_log_level(const char *value, unsigned line)
{ {
@ -121,23 +139,17 @@ void log_init(bool verbose, bool use_stdout)
g_get_charset(&log_charset); g_get_charset(&log_charset);
g_log_set_default_handler(mpd_log_func, NULL);
if (verbose) if (verbose)
log_threshold = G_LOG_LEVEL_DEBUG; log_threshold = G_LOG_LEVEL_DEBUG;
else if ((param = getConfigParam(CONF_LOG_LEVEL)) != NULL) else if ((param = getConfigParam(CONF_LOG_LEVEL)) != NULL)
log_threshold = parse_log_level(param->value, param->line); log_threshold = parse_log_level(param->value, param->line);
if (use_stdout) if (use_stdout) {
return; log_init_stdout();
} else {
param = parseConfigFilePath(CONF_LOG_FILE, 1); param = parseConfigFilePath(CONF_LOG_FILE, 1);
out_filename = param->value; log_init_file(param->value, param->line);
}
out_fd = open_log_file();
if (out_fd < 0)
FATAL("problem opening log file \"%s\" (config line %i) for "
"writing\n", param->value, param->line);
} }
void setup_log_output(bool use_stdout) void setup_log_output(bool use_stdout)