|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+From 9ac7cabaf9945fb92c96cb92f5ea85235f54f7d6 Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: Simon Horman <horms@verge.net.au>
|
|
|
3
|
+Date: Fri, 20 Jun 2014 12:29:47 +0900
|
|
|
4
|
+Subject: [PATCH] BUG/MEDIUM: Consistently use 'check' in process_chk
|
|
|
5
|
+
|
|
|
6
|
+I am not entirely sure that this is a bug, but it seems
|
|
|
7
|
+to me that it may cause a problem if there agent-check is
|
|
|
8
|
+configured and there is some kind of error making a connection for it.
|
|
|
9
|
+
|
|
|
10
|
+Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
|
11
|
+(cherry picked from commit ccaabcdfca23851af6fd83f4f3265284d283e2ab)
|
|
|
12
|
+---
|
|
|
13
|
+ src/checks.c | 2 +-
|
|
|
14
|
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
15
|
+
|
|
|
16
|
+diff --git a/src/checks.c b/src/checks.c
|
|
|
17
|
+index cba0018..f3b2b54 100644
|
|
|
18
|
+--- a/src/checks.c
|
|
|
19
|
++++ b/src/checks.c
|
|
|
20
|
+@@ -1541,7 +1541,7 @@ static struct task *process_chk(struct task *t)
|
|
|
21
|
+ * First, let's check whether there was an uncaught error,
|
|
|
22
|
+ * which can happen on connect timeout or error.
|
|
|
23
|
+ */
|
|
|
24
|
+- if (s->check.result == CHK_RES_UNKNOWN) {
|
|
|
25
|
++ if (check->result == CHK_RES_UNKNOWN) {
|
|
|
26
|
+ /* good connection is enough for pure TCP check */
|
|
|
27
|
+ if ((conn->flags & CO_FL_CONNECTED) && !check->type) {
|
|
|
28
|
+ if (check->use_ssl)
|
|
|
29
|
+--
|
|
|
30
|
+1.8.5.5
|
|
|
31
|
+
|
sbyx
10 years ago