From 2eb01accf7dbe5f891835f1b6c8f6205f304928d Mon Sep 17 00:00:00 2001 From: Thomas Mieslinger Date: Wed, 20 May 2020 08:09:02 +0200 Subject: [PATCH] replace long if else with compact code --- src/mysql.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) 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); -- 2.47.3