diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cli/Makefile.am | 1 | ||||
| -rw-r--r-- | src/daemon/Daemon.cpp | 13 | ||||
| -rw-r--r-- | src/daemon/Makefile.am | 1 | ||||
| -rw-r--r-- | src/daemon/MiddleWare.cpp | 2 | ||||
| -rw-r--r-- | src/daemon/abrt-action-save-package-data.c | 4 | ||||
| -rw-r--r-- | src/plugins/abrt-retrace-client.c | 5 |
6 files changed, 14 insertions, 12 deletions
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index ff6cd590..bf3ee065 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am @@ -10,7 +10,6 @@ abrt_cli_CPPFLAGS = \ -DVAR_RUN=\"$(VAR_RUN)\" \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ - $(ENABLE_SOCKET_OR_DBUS) \ $(DBUS_CFLAGS) $(GLIB_CFLAGS) \ -D_GNU_SOURCE \ -Wall -Wwrite-strings -Werror diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp index 5555138c..7e19bcaf 100644 --- a/src/daemon/Daemon.cpp +++ b/src/daemon/Daemon.cpp @@ -382,18 +382,18 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin crash_data_t *crash_data = NULL; fullname = concat_path_file(DEBUG_DUMPS_DIR, name); mw_result_t res = LoadDebugDump(fullname, &crash_data); - const char *first = get_crash_item_content_or_NULL(crash_data, CD_DUMPDIR); + const char *first = crash_data ? get_crash_item_content_or_NULL(crash_data, CD_DUMPDIR) : NULL; switch (res) { case MW_OK: - log("New crash %s, processing", fullname); + log("New dump directory %s, processing", fullname); /* Fall through */ case MW_OCCURRED: /* dup */ { if (res != MW_OK) { - log("Deleting crash %s (dup of %s), sending dbus signal", + log("Deleting dump directory %s (dup of %s), sending dbus signal", strrchr(fullname, '/') + 1, strrchr(first, '/') + 1); delete_dump_dir(fullname); @@ -408,8 +408,9 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin get_crash_item_content_or_NULL(crash_data, FILENAME_UID), get_crash_item_content_or_NULL(crash_data, FILENAME_UUID) ); - /* when dupe occurs we need to return first occure not the one which - * is deleted */ + /* When dup occurs we need to return first occurence, + * not the one which is deleted + */ send_dbus_sig_Crash(get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE), crash_id, //TODO: stop passing this param, it is unused (first)? first: fullname, @@ -421,7 +422,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin case MW_CORRUPTED: case MW_GPG_ERROR: default: - log("Corrupted or bad crash %s (res:%d), deleting", fullname, (int)res); + log("Corrupted or bad dump %s (res:%d), deleting", fullname, (int)res); delete_dump_dir(fullname); break; } diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 4c48ceb9..d5549200 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -28,7 +28,6 @@ abrtd_CPPFLAGS = \ -DLIBEXEC_DIR=\"$(LIBEXEC_DIR)\" \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ - $(ENABLE_SOCKET_OR_DBUS) \ -D_GNU_SOURCE \ -Wall -Wwrite-strings abrtd_LDADD = \ diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp index 6ee0d0c0..a226194a 100644 --- a/src/daemon/MiddleWare.cpp +++ b/src/daemon/MiddleWare.cpp @@ -551,7 +551,7 @@ mw_result_t LoadDebugDump(const char *dump_dir_name, crash_data_t **crash_data) res = MW_OK; if (count > 1) { - log("Crash dump is a duplicate of %s", dump_dir_name); + log("Dump directory is a duplicate of %s", dump_dir_name); res = MW_OCCURRED; } } diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c index 76f47246..0416cdef 100644 --- a/src/daemon/abrt-action-save-package-data.c +++ b/src/daemon/abrt-action-save-package-data.c @@ -261,10 +261,10 @@ int main(int argc, char **argv) unsigned opts = parse_opts(argc, argv, program_options, program_usage_string); putenv(xasprintf("ABRT_VERBOSE=%u", g_verbose)); - msg_prefix = PROGNAME; + //msg_prefix = PROGNAME; if (opts & OPT_s) { - openlog(msg_prefix, 0, LOG_DAEMON); + openlog(PROGNAME, 0, LOG_DAEMON); logmode = LOGMODE_SYSLOG; } diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c index c43fd0b6..da11a161 100644 --- a/src/plugins/abrt-retrace-client.c +++ b/src/plugins/abrt-retrace-client.c @@ -668,11 +668,14 @@ static int run_batch(bool delete_temp_archive) free(backtrace_text); } else + { run_log(task_id, task_password); + retcode = 1; + } free(task_status); free(task_id); free(task_password); - return 0; + return retcode; } int main(int argc, char **argv) |