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

log: merged initLog() and open_log_files(). 

The logging library currently has 3 constructor functions: initLog(),
open_log_files(), setup_log_output(), called in this order.  Merged
the first two.
This commit is contained in:
Max Kellermann 2008-12-28 19:48:53 +01:00
parent caf47f7893
commit d70c2e2285
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/log.c
View File

@ -115,7 +115,7 @@ parse_log_level(const char *value, unsigned line)
value, line); value, line);
} }
void initLog(bool verbose) void log_init(bool verbose, bool use_stdout)
{ {
ConfigParam *param; ConfigParam *param;
@ -127,11 +127,6 @@ void initLog(bool 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);
}
void open_log_files(bool use_stdout)
{
ConfigParam *param;
if (use_stdout) if (use_stdout)
return; return;

4
src/log.h
View File

@ -29,12 +29,10 @@ G_GNUC_PRINTF(1, 2) void DEBUG(const char *fmt, ...);
G_GNUC_PRINTF(1, 2) void WARNING(const char *fmt, ...); G_GNUC_PRINTF(1, 2) void WARNING(const char *fmt, ...);
G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN void FATAL(const char *fmt, ...); G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN void FATAL(const char *fmt, ...);
void initLog(bool verbose); void log_init(bool verbose, bool use_stdout);
void setup_log_output(bool use_stdout); void setup_log_output(bool use_stdout);
void open_log_files(bool use_stdout);
int cycle_log_files(void); int cycle_log_files(void);
void close_log_files(void); void close_log_files(void);

4
src/main.c
View File

@ -277,15 +277,13 @@ int main(int argc, char *argv[])
initStats(); initStats();
tag_lib_init(); tag_lib_init();
initLog(options.verbose); log_init(options.verbose, options.stdOutput);
if (options.createDB <= 0) if (options.createDB <= 0)
listenOnPort(); listenOnPort();
changeToUser(); changeToUser();
open_log_files(options.stdOutput);
path_global_init(); path_global_init();
mapper_init(); mapper_init();
initPermissions(); initPermissions();