struct audiod_args_info conf;
static char *socket_name;
-static FILE *logfile;
static struct audio_format_info afi[NUM_AUDIO_FORMATS];
static struct signal_task signal_task_struct, *sig_task = &signal_task_struct;
);
}
-/**
- * the log function of para_audiod
- *
- * \param ll loglevel
- * \param fmt the format string
- */
-__printf_2_3 void para_log(int ll, const char* fmt,...)
+static int want_colors(void)
{
- va_list argp;
- FILE *outfd;
- struct tm *tm;
- time_t t1;
- char str[MAXLINE] = "";
- static char *hostname;
-
- if (ll < conf.loglevel_arg)
- return;
- if (!logfile && conf.daemon_given)
- return;
- if (!hostname)
- hostname = para_hostname();
- outfd = logfile? logfile : stderr;
- time(&t1);
- tm = localtime(&t1);
- strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
- fprintf(outfd, "%s %s ", str, hostname);
- if (conf.loglevel_arg <= LL_INFO)
- fprintf(outfd, "%i ", ll);
- va_start(argp, fmt);
- vfprintf(outfd, fmt, argp);
- va_end(argp);
+ if (conf.color_arg == color_arg_no)
+ return 0;
+ if (conf.color_arg == color_arg_yes)
+ return 1;
+ if (conf.logfile_given)
+ return 0;
+ return isatty(STDERR_FILENO);
}
static void parse_config_or_die(void)
{
char *config_file;
+ struct audiod_cmdline_parser_params params = {
+ .override = 0,
+ .initialize = 0,
+ .check_required = 1,
+ .check_ambiguity = 0,
+ .print_errors = 1
+ };
if (conf.config_file_given)
config_file = para_strdup(conf.config_file_arg);
PARA_EMERG_LOG("can not read config file %s\n", config_file);
goto err;
}
- if (config_file) {
- struct audiod_cmdline_parser_params params = {
- .override = 0,
- .initialize = 0,
- .check_required = 1,
- .check_ambiguity = 0,
- .print_errors = 1
- };
- if (audiod_cmdline_parser_config_file(config_file, &conf, ¶ms)) {
- PARA_EMERG_LOG("parse error in config file\n");
- goto err;
- }
+ if (audiod_cmdline_parser_config_file(config_file, &conf, ¶ms)) {
+ PARA_EMERG_LOG("parse error in config file\n");
+ goto err;
}
free(config_file);
+ daemon_set_loglevel(conf.loglevel_arg);
return;
err:
free(config_file);
int argc = 3;
PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
st->clock_diff_count--;
- client_open(argc, argv, &st->ct);
+ client_open(argc, argv, &st->ct, NULL);
set_stat_task_restart_barrier(2);
} else {
char *argv[] = {"audiod", "stat", NULL};
int argc = 2;
- client_open(argc, argv, &st->ct);
+ client_open(argc, argv, &st->ct, NULL);
set_stat_task_restart_barrier(5);
}
free(stat_item_values[SI_BASENAME]);
exit(0);
}
+static void init_colors_or_die(void)
+{
+ int ret, i;
+
+ if (!want_colors())
+ return;
+ daemon_set_default_log_colors();
+ daemon_set_flag(DF_COLOR_LOG);
+ for (i = 0; i < conf.log_color_given; i++) {
+ ret = daemon_set_log_color(conf.log_color_arg[i]);
+ if (ret < 0)
+ exit(EXIT_FAILURE);
+ }
+}
/**
* the main function of para_audiod
HANDLE_VERSION_FLAG("audiod", conf);
drop_privileges_or_die(conf.user_arg, conf.group_arg);
parse_config_or_die();
- if (conf.logfile_given)
- logfile = open_log(conf.logfile_arg);
- i = init_stream_io();
if (conf.help_given || conf.detailed_help_given)
print_help_and_die();
+ daemon_set_flag(DF_LOG_TIME);
+ daemon_set_flag(DF_LOG_HOSTNAME);
+ daemon_set_flag(DF_LOG_LL);
+ if (conf.logfile_given) {
+ daemon_set_logfile(conf.logfile_arg);
+ daemon_open_log_or_die();
+ }
+ init_colors_or_die();
+ i = init_stream_io();
if (i < 0) {
PARA_EMERG_LOG("init stream io error: %s\n", para_strerror(-i));
exit(EXIT_FAILURE);
}
- log_welcome("para_audiod", conf.loglevel_arg);
+ log_welcome("para_audiod");
server_uptime(UPTIME_SET);
set_initial_status();
FOR_EACH_SLOT(i)