projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d4291e
)
routeros: Added conditionals around collect_health code
author
Pavel Rochnyack
<pavel2000@ngs.ru>
Sun, 8 Jul 2018 06:17:11 +0000
(13:17 +0700)
committer
Pavel Rochnyack
<pavel2000@ngs.ru>
Sun, 8 Jul 2018 06:17:11 +0000
(13:17 +0700)
src/routeros.c
patch
|
blob
|
history
diff --git
a/src/routeros.c
b/src/routeros.c
index
7f5e608
..
5ba92c3
100644
(file)
--- a/
src/routeros.c
+++ b/
src/routeros.c
@@
-214,6
+214,7
@@
static int handle_system_resource(__attribute__((unused))
return 0;
} /* }}} int handle_system_resource */
return 0;
} /* }}} int handle_system_resource */
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3)
static int handle_system_health(__attribute__((unused))
ros_connection_t *c, /* {{{ */
const ros_system_health_t *r,
static int handle_system_health(__attribute__((unused))
ros_connection_t *c, /* {{{ */
const ros_system_health_t *r,
@@
-230,6
+231,7
@@
static int handle_system_health(__attribute__((unused))
return (0);
} /* }}} int handle_system_health */
#endif
return (0);
} /* }}} int handle_system_health */
#endif
+#endif
static int cr_read(user_data_t *user_data) /* {{{ */
{
static int cr_read(user_data_t *user_data) /* {{{ */
{
@@
-290,6
+292,7
@@
static int cr_read(user_data_t *user_data) /* {{{ */
}
}
}
}
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3)
if (rd->collect_health) {
status = ros_system_health(rd->connection, handle_system_health,
/* user data = */ rd);
if (rd->collect_health) {
status = ros_system_health(rd->connection, handle_system_health,
/* user data = */ rd);
@@
-303,6
+306,7
@@
static int cr_read(user_data_t *user_data) /* {{{ */
}
}
#endif
}
}
#endif
+#endif
return 0;
} /* }}} int cr_read */
return 0;
} /* }}} int cr_read */
@@
-363,9
+367,11
@@
static int cr_config_router(oconfig_item_t *ci) /* {{{ */
cf_util_get_boolean(child, &router_data->collect_df);
else if (strcasecmp("CollectDisk", child->key) == 0)
cf_util_get_boolean(child, &router_data->collect_disk);
cf_util_get_boolean(child, &router_data->collect_df);
else if (strcasecmp("CollectDisk", child->key) == 0)
cf_util_get_boolean(child, &router_data->collect_disk);
+#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3)
else if (strcasecmp("CollectHealth", child->key) == 0)
cf_util_get_boolean(child, &router_data->collect_health);
#endif
else if (strcasecmp("CollectHealth", child->key) == 0)
cf_util_get_boolean(child, &router_data->collect_health);
#endif
+#endif
else {
WARNING("routeros plugin: Unknown config option `%s'.", child->key);
}
else {
WARNING("routeros plugin: Unknown config option `%s'.", child->key);
}