summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-07-10 10:03:55 +0000
committerThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2008-07-10 10:03:55 +0000
commitb336798e4c1c2fab5e4396e45af6f07ddae647f1 (patch)
treead2f01e372f3f7cac9799127df8d60d666e16ad6 /plugins
parent9b94f99b2c7f958861a1f2c00c57ff64da4812a8 (diff)
downloadmonitoring-plugins-b336798e4c1c2fab5e4396e45af6f07ddae647f1.tar.gz
Verbose should not have to exceed 3 as per developement guidelines
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2025 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_disk.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index e9e72190..7f5c0096 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -227,11 +227,11 @@ main (int argc, char **argv)
227 /* Process for every path in list */ 227 /* Process for every path in list */
228 for (path = path_select_list; path; path=path->name_next) { 228 for (path = path_select_list; path; path=path->name_next) {
229 229
230 if (verbose > 3 && path->freespace_percent->warning != NULL && path->freespace_percent->critical != NULL) 230 if (verbose >= 3 && path->freespace_percent->warning != NULL && path->freespace_percent->critical != NULL)
231 printf("Thresholds(pct) for %s warn: %f crit %f\n",path->name, path->freespace_percent->warning->end, 231 printf("Thresholds(pct) for %s warn: %f crit %f\n",path->name, path->freespace_percent->warning->end,
232 path->freespace_percent->critical->end); 232 path->freespace_percent->critical->end);
233 233
234 if (verbose > 3 && path->group != NULL) 234 if (verbose >= 3 && path->group != NULL)
235 printf("Group of %s: %s\n",path->name,path->group); 235 printf("Group of %s: %s\n",path->name,path->group);
236 236
237 /* reset disk result */ 237 /* reset disk result */
@@ -271,7 +271,7 @@ main (int argc, char **argv)
271 fsp.fsu_files += tmpfsp.fsu_files; /* Total file nodes. */ 271 fsp.fsu_files += tmpfsp.fsu_files; /* Total file nodes. */
272 fsp.fsu_ffree += tmpfsp.fsu_ffree; /* Free file nodes. */ 272 fsp.fsu_ffree += tmpfsp.fsu_ffree; /* Free file nodes. */
273 273
274 if (verbose > 3) 274 if (verbose >= 3)
275 printf("Group %s: add %llu blocks (%s) \n", path->group, tmpfsp.fsu_bavail, temp_list->name); 275 printf("Group %s: add %llu blocks (%s) \n", path->group, tmpfsp.fsu_bavail, temp_list->name);
276 /* printf("Group %s: add %u blocks (%s)\n", temp_list->name); *//* path->group, tmpfsp.fsu_bavail, temp_list->name); */ 276 /* printf("Group %s: add %u blocks (%s)\n", temp_list->name); *//* path->group, tmpfsp.fsu_bavail, temp_list->name); */
277 277
@@ -420,7 +420,7 @@ main (int argc, char **argv)
420 420
421 } 421 }
422 422
423 if (verbose > 2) 423 if (verbose >= 2)
424 asprintf (&output, "%s%s", output, details); 424 asprintf (&output, "%s%s", output, details);
425 425
426 426
@@ -729,7 +729,7 @@ process_arguments (int argc, char **argv)
729 for (me = mount_list; me; me = me->me_next) { 729 for (me = mount_list; me; me = me->me_next) {
730 if (np_regex_match_mount_entry(me, &re)) { 730 if (np_regex_match_mount_entry(me, &re)) {
731 fnd = TRUE; 731 fnd = TRUE;
732 if (verbose > 3) 732 if (verbose >= 3)
733 printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir, optarg); 733 printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir, optarg);
734 734
735 /* add parameter if not found. overwrite thresholds if path has already been added */ 735 /* add parameter if not found. overwrite thresholds if path has already been added */
@@ -994,10 +994,10 @@ void
994stat_path (struct parameter_list *p) 994stat_path (struct parameter_list *p)
995{ 995{
996 /* Stat entry to check that dir exists and is accessible */ 996 /* Stat entry to check that dir exists and is accessible */
997 if (verbose > 3) 997 if (verbose >= 3)
998 printf("calling stat on %s\n", p->name); 998 printf("calling stat on %s\n", p->name);
999 if (stat (p->name, &stat_buf[0])) { 999 if (stat (p->name, &stat_buf[0])) {
1000 if (verbose > 3) 1000 if (verbose >= 3)
1001 printf("stat failed on %s\n", p->name); 1001 printf("stat failed on %s\n", p->name);
1002 printf("DISK %s - ", _("CRITICAL")); 1002 printf("DISK %s - ", _("CRITICAL"));
1003 die (STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("is not accessible"), strerror(errno)); 1003 die (STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("is not accessible"), strerror(errno));