diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch deleted file mode 100644 index 62a0978592..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 70eff899104b86bae02862927c76caaef5de5d3c Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikael Beckius <mikael.beckius@windriver.com> | ||
3 | Date: Thu, 7 May 2015 16:14:25 +0200 | ||
4 | Subject: [PATCH] Allow multiple attempts to connect to relayd. | ||
5 | |||
6 | It is unclear why a session needs to be made | ||
7 | unusable after a failure to connect to relayd | ||
8 | since a check for a relayd connection is | ||
9 | always made before a session can be configured. | ||
10 | |||
11 | The behaviour was introduced in: | ||
12 | d9078d0c000d04d49c599a72c1a725026b636ec0 | ||
13 | |||
14 | Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com> | ||
15 | [ The context has moved, adjust the hunk accordingly ] | ||
16 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
17 | Upstream-Status: Pending | ||
18 | --- | ||
19 | src/bin/lttng-sessiond/cmd.c | 8 -------- | ||
20 | 1 file changed, 8 deletions(-) | ||
21 | |||
22 | diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c | ||
23 | index 73b4ce3..36f62ee 100644 | ||
24 | --- a/src/bin/lttng-sessiond/cmd.c | ||
25 | +++ b/src/bin/lttng-sessiond/cmd.c | ||
26 | @@ -689,14 +689,6 @@ close_sock: | ||
27 | free(rsock); | ||
28 | |||
29 | error: | ||
30 | - if (ret != LTTNG_OK) { | ||
31 | - /* | ||
32 | - * The consumer output for this session should not be used anymore | ||
33 | - * since the relayd connection failed thus making any tracing or/and | ||
34 | - * streaming not usable. | ||
35 | - */ | ||
36 | - consumer->enabled = 0; | ||
37 | - } | ||
38 | return ret; | ||
39 | } | ||
40 | |||
41 | -- | ||
42 | 1.7.9.5 | ||
43 | |||