shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

dbus: also recognize error state for missing service that comes from original D-Bus

Browse Source
This commit is contained in:
Peter Rajnoha 2016-11-15 10:09:11 +01:00
parent 68d6d342f8
commit cd0736a945
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/notify/lvmnotify.c
View File

@ -15,7 +15,8 @@
#define LVM_DBUS_DESTINATION "com.redhat.lvmdbus1" #define LVM_DBUS_DESTINATION "com.redhat.lvmdbus1"
#define LVM_DBUS_PATH "/com/redhat/lvmdbus1/Manager" #define LVM_DBUS_PATH "/com/redhat/lvmdbus1/Manager"
#define LVM_DBUS_INTERFACE "com.redhat.lvmdbus1.Manager" #define LVM_DBUS_INTERFACE "com.redhat.lvmdbus1.Manager"
#define SD_BUS_NO_SUCH_UNIT_ERROR "org.freedesktop.systemd1.NoSuchUnit" #define SD_BUS_SYSTEMD_NO_SUCH_UNIT_ERROR "org.freedesktop.systemd1.NoSuchUnit"
#define SD_BUS_DBUS_SERVICE_UNKNOWN_ERROR "org.freedesktop.DBus.Error.ServiceUnknown"
#ifdef NOTIFYDBUS_SUPPORT #ifdef NOTIFYDBUS_SUPPORT
#include <systemd/sd-bus.h> #include <systemd/sd-bus.h>
@ -63,7 +64,8 @@ void lvmnotify_send(struct cmd_context *cmd)
cmd_name); cmd_name);
if (ret < 0) { if (ret < 0) {
if (sd_bus_error_has_name(&error, SD_BUS_NO_SUCH_UNIT_ERROR)) if (sd_bus_error_has_name(&error, SD_BUS_SYSTEMD_NO_SUCH_UNIT_ERROR) ||
sd_bus_error_has_name(&error, SD_BUS_DBUS_SERVICE_UNKNOWN_ERROR))
log_debug_dbus("%s: %s", _dbus_notification_failed_msg, error.message); log_debug_dbus("%s: %s", _dbus_notification_failed_msg, error.message);
else else
log_warn("WARNING: %s: %s", _dbus_notification_failed_msg, error.message); log_warn("WARNING: %s: %s", _dbus_notification_failed_msg, error.message);