diff options
| -rw-r--r-- | lib/utils/logging.c | 7 | ||||
| -rw-r--r-- | src/daemon/Daemon.cpp | 6 | ||||
| -rw-r--r-- | src/daemon/Makefile.am | 4 | ||||
| -rw-r--r-- | src/hooks/dumpoops.cpp | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/lib/utils/logging.c b/lib/utils/logging.c index b552fa8a..815efb5e 100644 --- a/lib/utils/logging.c +++ b/lib/utils/logging.c @@ -55,16 +55,19 @@ static void verror_msg_helper(const char *s, * This is needed for e.g. when multiple children * can produce log messages simultaneously. */ - prefix_len = strlen(msg_prefix); + prefix_len = msg_prefix[0] ? strlen(msg_prefix) + 2 : 0; strerr_len = strerr ? strlen(strerr) : 0; msgeol_len = strlen(msg_eol); /* +3 is for ": " before strerr and for terminating NUL */ msg = (char*) xrealloc(msg, prefix_len + used + strerr_len + msgeol_len + 3); /* TODO: maybe use writev instead of memmoving? Need full_writev? */ if (prefix_len) { + char *p; memmove(msg + prefix_len, msg, used); used += prefix_len; - memcpy(msg, msg_prefix, prefix_len); + p = stpcpy(msg, msg_prefix); + p[0] = ':'; + p[1] = ' '; } if (strerr) { if (s[0]) { diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp index 5d70c255..a0875279 100644 --- a/src/daemon/Daemon.cpp +++ b/src/daemon/Daemon.cpp @@ -787,7 +787,7 @@ int main(int argc, char** argv) } } - msg_prefix = "abrtd: "; /* for log(), error_msg() and such */ + msg_prefix = "abrtd"; /* for log(), error_msg() and such */ xpipe(s_signal_pipe); close_on_exec_on(s_signal_pipe[0]); @@ -839,7 +839,6 @@ int main(int argc, char** argv) bool lockfile_created = false; bool pidfile_created = false; CCrashWatcher watcher; - xmlrpc_env env; /* Initialization */ try @@ -851,10 +850,12 @@ int main(int argc, char** argv) throw 1; VERB1 log("Initializing XML-RPC library"); + xmlrpc_env env; xmlrpc_env_init(&env); xmlrpc_client_setup_global_const(&env); if (env.fault_occurred) error_msg_and_die("XML-RPC Fault: %s(%d)", env.fault_string, env.fault_code); + xmlrpc_env_clean(&env); VERB1 log("Initializing rpm library"); rpm_init(); @@ -966,7 +967,6 @@ int main(int argc, char** argv) /* Error or INT/TERM. Clean up, in reverse order. * Take care to not undo things we did not do. */ - xmlrpc_env_clean(&env); xmlrpc_client_teardown_global_const(); dumpsocket_shutdown(); rpm_destroy(); diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 7dacc604..cd69cd36 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -9,9 +9,9 @@ abrtd_SOURCES = \ CrashWatcher.h CrashWatcher.cpp \ CommLayerServer.h CommLayerServer.cpp \ CommLayerServerDBus.h CommLayerServerDBus.cpp \ - Daemon.h Daemon.cpp \ Settings.h Settings.cpp \ - dumpsocket.h dumpsocket.cpp + dumpsocket.h dumpsocket.cpp \ + Daemon.h Daemon.cpp abrtd_CPPFLAGS = \ -I$(srcdir)/../../inc \ -I$(srcdir)/../../lib/utils \ diff --git a/src/hooks/dumpoops.cpp b/src/hooks/dumpoops.cpp index 04400373..7f5b634c 100644 --- a/src/hooks/dumpoops.cpp +++ b/src/hooks/dumpoops.cpp @@ -70,7 +70,7 @@ int main(int argc, char **argv) if (!argv[0]) goto usage; - msg_prefix = xasprintf("%s: ", program_name); + msg_prefix = program_name; /* Load KerneloopsScanner plugin */ // const plugin_info_t *plugin_info; |