[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[monit-dev] [monit] r242 committed - * Fixed display of port response ti
From: |
monit |
Subject: |
[monit-dev] [monit] r242 committed - * Fixed display of port response time as -1 in 'monit status' if it wa... |
Date: |
Wed, 15 Sep 2010 12:37:59 +0000 |
Revision: 242
Author: martin2812
Date: Wed Sep 15 05:36:51 2010
Log: * Fixed display of port response time as -1 in 'monit status' if it
was called in
the middle of service test.
http://code.google.com/p/monit/source/detail?r=242
Modified:
/trunk/CHANGES.txt
/trunk/http/cervlet.c
/trunk/validate.c
=======================================
--- /trunk/CHANGES.txt Wed Sep 15 05:26:54 2010
+++ /trunk/CHANGES.txt Wed Sep 15 05:36:51 2010
@@ -119,6 +119,9 @@
* Fixed division by zero when 'monit status' was called immediately after
monit
start before service was initialized.
+* Fixed display of port response time as -1 in 'monit status' if it was
called in
+ the middle of service test.
+
Version 5.1.1
=======================================
--- /trunk/http/cervlet.c Wed Sep 15 05:24:38 2010
+++ /trunk/http/cervlet.c Wed Sep 15 05:36:51 2010
@@ -2187,10 +2187,10 @@
out_print(res,
"<tr><td>Process id </td><td>%d</td></tr>",
- s->inf->pid);
+ s->inf->pid > 0 ? s->inf->pid : 0);
out_print(res,
"<tr><td>Parent process id </td><td>%d</td></tr>",
- s->inf->ppid);
+ s->inf->ppid > 0 ? s->inf->ppid : 0);
uptime= Util_getUptime(s->inf->uptime, " ");
out_print(res,
@@ -2424,8 +2424,8 @@
" %-33s %d\n"
" %-33s %d\n"
" %-33s %s\n",
- "pid", s->inf->pid,
- "parent pid", s->inf->ppid,
+ "pid", s->inf->pid > 0 ? s->inf->pid : 0,
+ "parent pid", s->inf->ppid > 0 ? s->inf->ppid : 0,
"uptime", uptime);
FREE(uptime);
if(Run.doprocess) {
@@ -2451,7 +2451,7 @@
for(i= s->icmplist; i; i= i->next) {
out_print(res,
" %-33s %.3fs [%s]\n",
- "icmp response time", i->is_available?i->response:-1.,
+ "icmp response time", i->is_available ? i->response :
0.,
icmpnames[i->type]);
}
}
@@ -2461,14 +2461,14 @@
if(p->family == AF_INET) {
out_print(res,
" %-33s %.3fs to %s:%d%s [%s via %s]\n",
- "port response time",
p->is_available?p->response:-1.,
+ "port response time", p->is_available ?
p->response : 0.,
p->hostname,
p->port, p->request?p->request:"", p->protocol->name,
Util_portTypeDescription(p));
} else if(p->family == AF_UNIX) {
out_print(res,
" %-33s %.3fs to %s [%s]\n",
- "unix socket response time",
p->is_available?p->response:-1.,
+ "unix socket response time", p->is_available ?
p->response : 0.,
p->pathname, p->protocol->name);
}
}
=======================================
--- /trunk/validate.c Wed Sep 15 05:24:38 2010
+++ /trunk/validate.c Wed Sep 15 05:36:51 2010
@@ -557,8 +557,6 @@
ASSERT(s && p);
- p->response = -1;
-
/* Get time of connection attempt beginning */
gettimeofday(&t1, NULL);
@@ -596,9 +594,11 @@
p->response = (double)(t2.tv_sec - t1.tv_sec) + (double)(t2.tv_usec -
t1.tv_usec)/1000000;
error:
- if (socket) socket_free(&socket);
+ if (socket)
+ socket_free(&socket);
if (!rv) {
+ p->response = -1;
p->is_available = FALSE;
Event_post(s, Event_Connection, STATE_FAILED, p->action, report);
} else {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [monit-dev] [monit] r242 committed - * Fixed display of port response time as -1 in 'monit status' if it wa...,
monit <=