sources/storage.h: remove watchdog's query to lag_query

To keep things simplier

Signed-off-by: rkhapov <[email protected]>

sources/config_reader.c

@@ -1696,7 +1696,7 @@ static int od_config_reader_rule_settings(od_config_reader_t *reader,
 				return NOT_OK_RESPONSE;
 			}
 			if (!od_config_reader_string(reader,
-						     &watchdog->query)) {
+						     &watchdog->lag_query)) {
 				return NOT_OK_RESPONSE;
 			}
 			continue;

sources/rules.c

@@ -1760,10 +1760,10 @@ void od_rules_print(od_rules_t *rules, od_logger_t *logger)
 			       "  tls_protocols   %s",
 			       storage->tls_opts->tls_protocols);
 		if (storage->watchdog) {
-			if (storage->watchdog->query)
+			if (storage->watchdog->lag_query)
 				od_log(logger, "storage", NULL, NULL,
 				       "  watchdog query   %s",
-				       storage->watchdog->query);
+				       storage->watchdog->lag_query);
 			if (storage->watchdog->interval)
 				od_log(logger, "storage", NULL, NULL,
 				       "  watchdog interval   %d",

sources/storage.c

@@ -19,6 +19,7 @@ od_storage_watchdog_t *od_storage_watchdog_allocate(od_global_t *global)
 	memset(watchdog, 0, sizeof(od_storage_watchdog_t));
 	watchdog->global = global;
 	watchdog->online = 1;
+	watchdog->lag_query = NULL;
 	od_atomic_u64_set(&watchdog->finished, 0ULL);
 	pthread_mutex_init(&watchdog->mu, NULL);
 
@@ -59,8 +60,8 @@ int od_storage_watchdog_free(od_storage_watchdog_t *watchdog)
 		return NOT_OK_RESPONSE;
 	}
 
-	if (watchdog->query) {
-		free(watchdog->query);
+	if (watchdog->lag_query) {
+		free(watchdog->lag_query);
 	}
 
 	pthread_mutex_destroy(&watchdog->mu);
@@ -404,7 +405,7 @@ od_storage_watchdog_do_polling_step(od_storage_watchdog_t *watchdog)
 	server = watchdog_client->server;
 
 	machine_msg_t *msg;
-	msg = od_query_do(server, "watchdog", watchdog->query, NULL);
+	msg = od_query_do(server, "watchdog", watchdog->lag_query, NULL);
 	if (msg == NULL) {
 		od_error(&instance->logger, "watchdog", watchdog_client, server,
 			 "receive msg failed, closing backend connection");

sources/storage.h

@@ -23,7 +23,7 @@ struct od_storage_watchdog {
 	char *storage_user;
 	char *storage_db;
 
-	char *query;
+	char *lag_query;
 	int interval;
 
 	/* soft shutdown on reload */