From: Thomas Mieslinger <thomas.mieslinger@1und1.de>
Date: Wed, 20 May 2020 06:09:02 +0000 (+0200)
Subject: replace long if else with compact code
X-Git-Tag: collectd-5.12.0~34^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eb01accf7dbe5f891835f1b6c8f6205f304928d;p=thirdparty%2Fcollectd.git

replace long if else with compact code
---

diff --git a/src/mysql.c b/src/mysql.c
index b1248f19a..db1926d8b 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -472,20 +472,13 @@ static int mysql_read_slave_stats(mysql_database_t *db, MYSQL *con) {
     unsigned long long counter;
     double gauge;
 
-    if (row[SLAVE_SQL_RUNNING_IDX] == NULL) {
-      gauge_submit("slave_running", "sql", 1, db);
-    } else if (strcasecmp(row[SLAVE_SQL_RUNNING_IDX], "yes") != 0) {
-      gauge_submit("slave_running", "sql", 1, db);
-    } else {
-      gauge_submit("slave_running", "sql", 0, db);
-    }
-    if (row[SLAVE_IO_RUNNING_IDX] == NULL) {
-      gauge_submit("slave_running", "io", 1, db);
-    } else if (strcasecmp(row[SLAVE_IO_RUNNING_IDX], "yes") != 0) {
-      gauge_submit("slave_running", "io", 1, db);
-    } else {
-      gauge_submit("slave_running", "io", 0, db);
-    }
+    gauge_submit("bool", "slave-sql-running",
+      (row[SLAVE_SQL_RUNNING_IDX] != NULL) && (strcasecmp(row[SLAVE_SQL_RUNNING_IDX], "yes") == 0),
+       db);
+
+    gauge_submit("bool", "slave-io-running",
+      (row[SLAVE_IO_RUNNING_IDX] != NULL) && (strcasecmp(row[SLAVE_IO_RUNNING_IDX], "yes") == 0),
+       db);
 
     counter = atoll(row[READ_MASTER_LOG_POS_IDX]);
     derive_submit("mysql_log_position", "slave-read", counter, db);