Skip to content

Commit 605577d

Browse files
committed
Delete on_die=exit option
1 parent 6802dac commit 605577d

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

main/gridinit.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
5454
#include "./gridinit_alerts.h"
5555
#include "../lib/gridinit-internals.h"
5656

57-
#define USERFLAG_ONDIE_EXIT 0x00000001
5857
#define USERFLAG_PROCESS_DIED 0x00000002
5958
#define USERFLAG_PROCESS_RESTARTED 0x00000004
6059

@@ -209,13 +208,6 @@ alert_proc_died(void *udata, struct child_info_s *ci)
209208
{
210209
(void) udata;
211210

212-
/* if the user_flags on the process contain the on_die:exit flag,
213-
* then we mark the gridinit to stop */
214-
if (ci->user_flags & USERFLAG_ONDIE_EXIT) {
215-
supervisor_children_enable(ci->key, FALSE);
216-
flag_running = FALSE;
217-
}
218-
219211
if (ci->started)
220212
supervisor_children_set_user_flags(ci->key, USERFLAG_PROCESS_DIED);
221213
}
@@ -1250,10 +1242,6 @@ _cfg_section_service(GKeyFile *kf, const gchar *section, GError **err)
12501242
if (0 > supervisor_children_set_respawn(str_key, FALSE))
12511243
WARN("Failed to make [%s] respawn : %s", str_key, strerror(errno));
12521244
}
1253-
else if (0 == g_ascii_strcasecmp(str_ondie, "exit")) {
1254-
supervisor_children_set_user_flags(str_key, USERFLAG_ONDIE_EXIT);
1255-
supervisor_children_set_respawn(str_key, FALSE);
1256-
}
12571245
else if (0 == g_ascii_strcasecmp(str_ondie, "respawn"))
12581246
supervisor_children_set_respawn(str_key, TRUE);
12591247
else {

0 commit comments

Comments
 (0)