From 13c6075693091d1cae68686a1bfaa394b57f1447 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1?= Date: Wed, 8 Jul 2020 15:33:59 +0200 Subject: [PATCH] demo: kresd instances status correction --- utils/watcher/dbus_control.c | 4 ++-- utils/watcher/sr_subscriptions.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/utils/watcher/dbus_control.c b/utils/watcher/dbus_control.c index 1b01e57ce..82dd3bae2 100644 --- a/utils/watcher/dbus_control.c +++ b/utils/watcher/dbus_control.c @@ -27,12 +27,12 @@ int kresd_get_status(const char *instance, char **status) int ret = sd_bus_default_system(&bus); - asprintf(&instance_service, SERVICE_KRESD, instance); + asprintf(&instance_service, DBUS_PATH_KRESD, instance); ret = sd_bus_get_property_string( bus, DBUS_SD_NAME, - DBUS_PATH_GC, + instance_service, DBUS_INT_UNIT, "ActiveState", &err, diff --git a/utils/watcher/sr_subscriptions.c b/utils/watcher/sr_subscriptions.c index 812468722..26fe1b005 100644 --- a/utils/watcher/sr_subscriptions.c +++ b/utils/watcher/sr_subscriptions.c @@ -119,12 +119,11 @@ int set_tst_secret(const char *new_secret) static int server_status_cb(sr_session_ctx_t *session, const char *module_name, const char *xpath, const char *request_xpath, uint32_t request_id, struct lyd_node **parent, void *private_data) { - char *cache_gc_status; - /* kresd instances status */ kresd_instances_status(parent); /* Cache Garbage Collector status */ + char *cache_gc_status; cache_gc_get_status(&cache_gc_status); lyd_new_path(*parent, NULL, XPATH_STATUS"/cache-gc", cache_gc_status, 0, 0); -- 2.47.2