mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: Harmonize log target output

Browse source 
The file targets used different output format than stderr and syslog.
That's now fixed.
This commit is contained in:
Tanu Kaskinen 2013-06-20 17:24:28 +03:00
parent a1fdbcfaa7
commit b5e1c06a5e
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pulsecore/log.c
View file

@ -466,12 +466,23 @@ void pa_log_levelv_meta(
case PA_LOG_FILE: case PA_LOG_FILE:
case PA_LOG_NEWFILE: { case PA_LOG_NEWFILE: {
char *local_t;
if ((local_t = pa_utf8_to_locale(t)))
t = local_t;
if (log_fd >= 0) { if (log_fd >= 0) {
char metadata[256]; char metadata[256];
pa_snprintf(metadata, sizeof(metadata), "\n%c %s %s", level_to_char[level], timestamp, location); if (_flags & PA_LOG_PRINT_LEVEL)
pa_snprintf(metadata, sizeof(metadata), "%s%c: %s", timestamp, level_to_char[level], location);
else
pa_snprintf(metadata, sizeof(metadata), "%s%s", timestamp, location);
if ((pa_write(log_fd, metadata, strlen(metadata), &write_type) < 0) || (pa_write(log_fd, t, strlen(t), &write_type) < 0)) { if ((pa_write(log_fd, metadata, strlen(metadata), &write_type) < 0)
|| (pa_write(log_fd, t, strlen(t), &write_type) < 0)
|| (bt && pa_write(log_fd, bt, strlen(bt), &write_type) < 0)
|| (pa_write(log_fd, "\n", 1, &write_type) < 0)) {
pa_log_target new_target = { .type = PA_LOG_STDERR, .file = NULL }; pa_log_target new_target = { .type = PA_LOG_STDERR, .file = NULL };
saved_errno = errno; saved_errno = errno;
fprintf(stderr, "%s\n", "Error writing logs to a file descriptor. Redirect log messages to console."); fprintf(stderr, "%s\n", "Error writing logs to a file descriptor. Redirect log messages to console.");
@ -480,6 +491,8 @@ void pa_log_levelv_meta(
} }
} }
pa_xfree(local_t);
break; break;
} }
case PA_LOG_NULL: case PA_LOG_NULL: