From: Aleš <ales.mrazek@nic.cz>
Date: Wed, 8 Jul 2020 13:33:59 +0000 (+0200)
Subject: demo: kresd instances status correction
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fsysrepo-demo;p=thirdparty%2Fknot-resolver.git

demo: kresd instances status correction
---

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);