[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[monit-dev] [monit] r245 committed - remove extra parenthesis on one lin
From: |
monit |
Subject: |
[monit-dev] [monit] r245 committed - remove extra parenthesis on one line (join format strings) |
Date: |
Thu, 16 Sep 2010 08:48:48 +0000 |
Revision: 245
Author: martin2812
Date: Thu Sep 16 01:47:46 2010
Log: remove extra parenthesis on one line (join format strings)
http://code.google.com/p/monit/source/detail?r=245
Modified:
/trunk/validate.c
=======================================
--- /trunk/validate.c Wed Sep 15 05:36:51 2010
+++ /trunk/validate.c Thu Sep 16 01:47:46 2010
@@ -778,7 +778,7 @@
case RESOURCE_ID_LOAD1:
if (Util_evalQExpression(r->operator,
(int)(systeminfo.loadavg[0]*10.0), r->limit)) {
- snprintf(report, STRLEN, "loadavg(1min) of %.1f matches resource
limit " "[loadavg(1min)%s%.1f]", systeminfo.loadavg[0],
operatorshortnames[r->operator], r->limit/10.0);
+ snprintf(report, STRLEN, "loadavg(1min) of %.1f matches resource
limit [loadavg(1min)%s%.1f]", systeminfo.loadavg[0],
operatorshortnames[r->operator], r->limit/10.0);
okay = FALSE;
} else
snprintf(report, STRLEN, "'%s' loadavg(1min) check succeeded
[current loadavg(1min)=%.1f]", s->name, systeminfo.loadavg[0]);
@@ -786,7 +786,7 @@
case RESOURCE_ID_LOAD5:
if (Util_evalQExpression(r->operator,
(int)(systeminfo.loadavg[1]*10.0), r->limit)) {
- snprintf(report, STRLEN, "loadavg(5min) of %.1f matches resource
limit " "[loadavg(5min)%s%.1f]", systeminfo.loadavg[1],
operatorshortnames[r->operator], r->limit/10.0);
+ snprintf(report, STRLEN, "loadavg(5min) of %.1f matches resource
limit [loadavg(5min)%s%.1f]", systeminfo.loadavg[1],
operatorshortnames[r->operator], r->limit/10.0);
okay = FALSE;
} else
snprintf(report, STRLEN, "'%s' loadavg(5min) check succeeded
[current loadavg(5min)=%.1f]", s->name, systeminfo.loadavg[1]);
@@ -794,7 +794,7 @@
case RESOURCE_ID_LOAD15:
if (Util_evalQExpression(r->operator,
(int)(systeminfo.loadavg[2]*10.0), r->limit)) {
- snprintf(report, STRLEN, "loadavg(15min) of %.1f matches resource
limit " "[loadavg(15min)%s%.1f]", systeminfo.loadavg[2],
operatorshortnames[r->operator], r->limit/10.0);
+ snprintf(report, STRLEN, "loadavg(15min) of %.1f matches resource
limit [loadavg(15min)%s%.1f]", systeminfo.loadavg[2],
operatorshortnames[r->operator], r->limit/10.0);
okay = FALSE;
} else
snprintf(report, STRLEN, "'%s' loadavg(15min) check succeeded
[current loadavg(15min)=%.1f]", s->name, systeminfo.loadavg[2]);
@@ -810,18 +810,18 @@
case RESOURCE_ID_TOTAL_MEM_KBYTE:
if (Util_evalQExpression(r->operator, s->inf->total_mem_kbyte,
r->limit)) {
- snprintf(report, STRLEN, "total mem amount of %ldkB matches resource
limit" " [total mem amount%s%ldkB]", s->inf->total_mem_kbyte,
operatorshortnames[r->operator], r->limit);
+ snprintf(report, STRLEN, "total mem amount of %ldkB matches resource
limit [total mem amount%s%ldkB]", s->inf->total_mem_kbyte,
operatorshortnames[r->operator], r->limit);
okay = FALSE;
} else
- snprintf(report, STRLEN, "'%s' total mem amount check
succeeded " "[current total mem amount=%ldkB]", s->name,
s->inf->total_mem_kbyte);
+ snprintf(report, STRLEN, "'%s' total mem amount check succeeded
[current total mem amount=%ldkB]", s->name, s->inf->total_mem_kbyte);
break;
case RESOURCE_ID_TOTAL_MEM_PERCENT:
if (Util_evalQExpression(r->operator, s->inf->total_mem_percent,
r->limit)) {
- snprintf(report, STRLEN, "total mem amount of %.1f%% matches
resource limit" " [total mem amount%s%.1f%%]",
(float)s->inf->total_mem_percent/10.0, operatorshortnames[r->operator],
(float)r->limit/10.0);
+ snprintf(report, STRLEN, "total mem amount of %.1f%% matches
resource limit [total mem amount%s%.1f%%]",
(float)s->inf->total_mem_percent/10.0, operatorshortnames[r->operator],
(float)r->limit/10.0);
okay = FALSE;
} else
- snprintf(report, STRLEN, "'%s' total mem amount check
succeeded " "[current total mem amount=%.1f%%]", s->name,
s->inf->total_mem_percent/10.0);
+ snprintf(report, STRLEN, "'%s' total mem amount check succeeded
[current total mem amount=%.1f%%]", s->name,
s->inf->total_mem_percent/10.0);
break;
default:
@@ -1249,7 +1249,7 @@
}
} else {
if (Util_evalQExpression(td->operator, s->inf->space_total,
td->limit_absolute)) {
- Event_post(s, Event_Resource, STATE_FAILED, td->action, "space
usage %ld blocks matches resource limit " "[space usage%s%ld blocks]",
s->inf->space_total, operatorshortnames[td->operator], td->limit_absolute);
+ Event_post(s, Event_Resource, STATE_FAILED, td->action, "space
usage %ld blocks matches resource limit [space usage%s%ld blocks]",
s->inf->space_total, operatorshortnames[td->operator], td->limit_absolute);
return;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [monit-dev] [monit] r245 committed - remove extra parenthesis on one line (join format strings),
monit <=