[BUG] checks: fix newline termination
We can't put a newline in server_status_printf() as there might be
something added later.
diff --git a/src/checks.c b/src/checks.c
index 5db5f9e..05cb549 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -173,13 +173,13 @@
if (xferred > 0) {
if (!(s->state & SRV_RUNNING))
chunk_printf(msg, ". %d active and %d backup servers left.%s"
- " %d sessions active, %d requeued, %d remaining in queue.\n",
+ " %d sessions active, %d requeued, %d remaining in queue",
s->proxy->srv_act, s->proxy->srv_bck,
(s->proxy->srv_bck && !s->proxy->srv_act) ? " Running on backup." : "",
s->cur_sess, xferred, s->nbpend);
else
chunk_printf(msg, ". %d active and %d backup servers online.%s"
- " %d sessions requeued, %d total in queue.\n",
+ " %d sessions requeued, %d total in queue",
s->proxy->srv_act, s->proxy->srv_bck,
(s->proxy->srv_bck && !s->proxy->srv_act) ? " Running on backup." : "",
xferred, s->nbpend);
@@ -278,13 +278,13 @@
server_status_printf(&msg, s, SSP_O_HCHK, -1);
- chunk_printf(&msg, ", status: %d/%d %s.\n",
+ chunk_printf(&msg, ", status: %d/%d %s",
(state & SRV_RUNNING) ? (health - rise + 1) : (health),
(state & SRV_RUNNING) ? (fall) : (rise),
(state & SRV_RUNNING)?"UP":"DOWN");
- Warning("%s", trash);
- send_log(s->proxy, LOG_NOTICE, "%s", trash);
+ Warning("%s.\n", trash);
+ send_log(s->proxy, LOG_NOTICE, "%s.\n", trash);
}
}
@@ -387,13 +387,13 @@
((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0),
xferred);
- Warning("%s", trash);
+ Warning("%s.\n", trash);
/* we don't send an alert if the server was previously paused */
if (srv_was_paused)
- send_log(s->proxy, LOG_NOTICE, "%s", trash);
+ send_log(s->proxy, LOG_NOTICE, "%s.\n", trash);
else
- send_log(s->proxy, LOG_ALERT, "%s", trash);
+ send_log(s->proxy, LOG_ALERT, "%s.\n", trash);
if (s->proxy->srv_bck == 0 && s->proxy->srv_act == 0)
set_backend_down(s->proxy);
@@ -455,8 +455,8 @@
((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0),
xferred);
- Warning("%s", trash);
- send_log(s->proxy, LOG_NOTICE, "%s", trash);
+ Warning("%s.\n", trash);
+ send_log(s->proxy, LOG_NOTICE, "%s.\n", trash);
if (s->state & SRV_CHECKED)
for(srv = s->tracknext; srv; srv = srv->tracknext)
@@ -494,8 +494,8 @@
((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0),
xferred);
- Warning("%s", trash);
- send_log(s->proxy, LOG_NOTICE, "%s", trash);
+ Warning("%s.\n", trash);
+ send_log(s->proxy, LOG_NOTICE, "%s.\n", trash);
if (!s->proxy->srv_bck && !s->proxy->srv_act)
set_backend_down(s->proxy);
@@ -530,8 +530,8 @@
((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0),
xferred);
- Warning("%s", trash);
- send_log(s->proxy, LOG_NOTICE, "%s", trash);
+ Warning("%s.\n", trash);
+ send_log(s->proxy, LOG_NOTICE, "%s.\n", trash);
if (s->state & SRV_CHECKED)
for(srv = s->tracknext; srv; srv = srv->tracknext)