summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--module/bsnmp-jails.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 326b718..cc4a17c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
- Add support for monitoring CPU time of a jail.
- Number of threads in jail exposed via SNMP.
- Tracking of combined RSS memory of jail.
+ - Don't run jail-measure if no jails are running.
0.4
- Fix problems with capturing IPv6 packets.
diff --git a/module/bsnmp-jails.c b/module/bsnmp-jails.c
index 542d30c..075ee50 100644
--- a/module/bsnmp-jails.c
+++ b/module/bsnmp-jails.c
@@ -721,6 +721,9 @@ measure_get_command (void)
char **args;
int i;
+ if (!jaildat_count)
+ return NULL;
+
args = calloc (jaildat_count + 4, sizeof (char*));
if (!args) {
emsg ("out of memory");