mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli, log: Improve the set-log-target functionality

Browse source 
Add a new log target 'newfile:PATH', and refactoring 'pa_log_target_type'.

Signed-off-by: Shuai Fan <shuai900217@126.com>
This commit is contained in:
Shuai Fan 2013-06-19 11:59:08 +08:00 • committed by Tanu Kaskinen
parent e05c12f28b
commit b0bf132f8f
7 changed files with 205 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

79
src/daemon/daemon-conf.c
View file

@ -73,12 +73,11 @@ static const pa_daemon_conf default_conf = {
.flat_volumes = TRUE,
.exit_idle_time = 20,
.scache_idle_time = 20,
.auto_log_target = 1,
.script_commands = NULL,
.dl_search_path = NULL,
.load_default_script_file = TRUE,
.default_script_file = NULL,
.log_target = PA_LOG_SYSLOG,
.log_target = NULL,
.log_level = PA_LOG_NOTICE,
.log_backtrace = 0,
.log_meta = FALSE,
@ -167,77 +166,31 @@ pa_daemon_conf *pa_daemon_conf_new(void) {
void pa_daemon_conf_free(pa_daemon_conf *c) {
pa_assert(c);
pa_log_set_fd(-1);
pa_xfree(c->script_commands);
pa_xfree(c->dl_search_path);
pa_xfree(c->default_script_file);
if (c->log_target)
pa_log_target_free(c->log_target);
pa_xfree(c->config_file);
pa_xfree(c);
}
#define PA_LOG_MAX_SUFFIX_NUMBER 100
int pa_daemon_conf_set_log_target(pa_daemon_conf *c, const char *string) {
pa_log_target *log_target = NULL;
pa_assert(c);
pa_assert(string);
if (pa_streq(string, "auto"))
c->auto_log_target = 1;
else if (pa_streq(string, "syslog")) {
c->auto_log_target = 0;
c->log_target = PA_LOG_SYSLOG;
} else if (pa_streq(string, "stderr")) {
c->auto_log_target = 0;
c->log_target = PA_LOG_STDERR;
} else if (pa_startswith(string, "file:")) {
char file_path[512];
int log_fd;
if (!pa_streq(string, "auto")) {
log_target = pa_log_parse_target(string);
pa_strlcpy(file_path, string + 5, sizeof(file_path));
/* Open target file with user rights */
if ((log_fd = open(file_path, O_RDWR|O_TRUNC|O_CREAT, S_IRUSR | S_IWUSR)) >= 0) {
c->auto_log_target = 0;
c->log_target = PA_LOG_FD;
pa_log_set_fd(log_fd);
} else {
printf("Failed to open target file %s, error : %s\n", file_path, pa_cstrerror(errno));
if (!log_target)
return -1;
}
} else if (pa_startswith(string, "newfile:")) {
char file_path[512];
int log_fd;
int version = 0;
int left_size;
char *p;
}
pa_strlcpy(file_path, string + 8, sizeof(file_path));
left_size = sizeof(file_path) - strlen(file_path);
p = file_path + strlen(file_path);
do {
memset(p, 0, left_size);
if (version > 0)
pa_snprintf(p, left_size, ".%d", version);
} while (++version <= PA_LOG_MAX_SUFFIX_NUMBER &&
(log_fd = open(file_path, O_RDWR|O_TRUNC|O_CREAT|O_EXCL, S_IRUSR | S_IWUSR)) < 0);
if (version > PA_LOG_MAX_SUFFIX_NUMBER) {
memset(p, 0, left_size);
printf("Tried to open target files '%s', '%s.1', '%s.2' ... '%s.%d', but all failed.\n",
file_path, file_path, file_path, file_path, PA_LOG_MAX_SUFFIX_NUMBER - 1);
return -1;
} else {
printf("Opened target file %s\n", file_path);
c->auto_log_target = 0;
c->log_target = PA_LOG_FD;
pa_log_set_fd(log_fd);
}
} else
return -1;
c->log_target = log_target;
return 0;
}
@ -755,6 +708,7 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
pa_strbuf *s;
char cm[PA_CHANNEL_MAP_SNPRINT_MAX];
char *log_target = NULL;
pa_assert(c);
@ -765,6 +719,9 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
pa_assert(c->log_level < PA_LOG_LEVEL_MAX);
if (c->log_target)
log_target = pa_log_target_to_string(c->log_target);
pa_strbuf_printf(s, "daemonize = %s\n", pa_yes_no(c->daemonize));
pa_strbuf_printf(s, "fail = %s\n", pa_yes_no(c->fail));
pa_strbuf_printf(s, "high-priority = %s\n", pa_yes_no(c->high_priority));
@ -787,7 +744,7 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
pa_strbuf_printf(s, "dl-search-path = %s\n", pa_strempty(c->dl_search_path));
pa_strbuf_printf(s, "default-script-file = %s\n", pa_strempty(pa_daemon_conf_get_default_script_file(c)));
pa_strbuf_printf(s, "load-default-script-file = %s\n", pa_yes_no(c->load_default_script_file));
pa_strbuf_printf(s, "log-target = %s\n", c->auto_log_target ? "auto" : (c->log_target == PA_LOG_SYSLOG ? "syslog" : "stderr"));
pa_strbuf_printf(s, "log-target = %s\n", pa_strempty(log_target));
pa_strbuf_printf(s, "log-level = %s\n", log_level_to_string[c->log_level]);
pa_strbuf_printf(s, "resample-method = %s\n", pa_resample_method_to_string(c->resample_method));
pa_strbuf_printf(s, "enable-remixing = %s\n", pa_yes_no(!c->disable_remixing));
@ -846,5 +803,7 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
#endif
#endif
pa_xfree(log_target);
return pa_strbuf_tostring_free(s);
}

3
src/daemon/daemon-conf.h
View file

@ -80,12 +80,11 @@ typedef struct pa_daemon_conf {
pa_server_type_t local_server_type;
int exit_idle_time,
scache_idle_time,
auto_log_target,
realtime_priority,
nice_level,
resample_method;
char *script_commands, *dl_search_path, *default_script_file;
pa_log_target_t log_target;
pa_log_target *log_target;
pa_log_level_t log_level;
unsigned log_backtrace;
char *config_file;

16
src/daemon/main.c
View file

@ -499,8 +499,14 @@ int main(int argc, char *argv[]) {
goto finish;
}
if (conf->log_target)
pa_log_set_target(conf->log_target);
else {
pa_log_target target = { .type = PA_LOG_STDERR, .file = NULL };
pa_log_set_target(&target);
}
pa_log_set_level(conf->log_level);
pa_log_set_target(conf->auto_log_target ? PA_LOG_STDERR : conf->log_target);
if (conf->log_meta)
pa_log_set_flags(PA_LOG_PRINT_META, PA_LOG_SET);
if (conf->log_time)
@ -810,8 +816,10 @@ int main(int argc, char *argv[]) {
daemon_pipe[0] = -1;
#endif
if (conf->auto_log_target)
pa_log_set_target(PA_LOG_SYSLOG);
if (!conf->log_target) {
pa_log_target target = { .type = PA_LOG_SYSLOG, .file = NULL };
pa_log_set_target(&target);
}
#ifdef HAVE_SETSID
if (setsid() < 0) {
@ -1042,7 +1050,7 @@ int main(int argc, char *argv[]) {
c->cpu_info.cpu_type = PA_CPU_X86;
if (pa_cpu_init_arm(&(c->cpu_info.flags.arm)))
c->cpu_info.cpu_type = PA_CPU_ARM;
pa_cpu_init_orc(c->cpu_info);
pa_cpu_init_orc(c->cpu_info);
}
pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0);