doveadm-master.c (dovecot-2.3.16) | : | doveadm-master.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 84 | skipping to change at line 84 | |||
if (kill(pid, 0) < 0) { | if (kill(pid, 0) < 0) { | |||
if (errno != ESRCH) | if (errno != ESRCH) | |||
i_error("kill() failed: %m"); | i_error("kill() failed: %m"); | |||
break; | break; | |||
} | } | |||
i_sleep_msecs(100); | i_sleep_msecs(100); | |||
} | } | |||
} | } | |||
} | } | |||
static void cmd_stop(int argc ATTR_UNUSED, char *argv[] ATTR_UNUSED) | static void cmd_stop(struct doveadm_cmd_context *cctx ATTR_UNUSED) | |||
{ | { | |||
doveadm_master_send_signal(SIGTERM); | doveadm_master_send_signal(SIGTERM); | |||
} | } | |||
static void cmd_reload(int argc ATTR_UNUSED, char *argv[] ATTR_UNUSED) | static void cmd_reload(struct doveadm_cmd_context *cctx ATTR_UNUSED) | |||
{ | { | |||
doveadm_master_send_signal(SIGHUP); | doveadm_master_send_signal(SIGHUP); | |||
} | } | |||
static struct istream *master_service_send_cmd(const char *cmd) | static struct istream *master_service_send_cmd(const char *cmd) | |||
{ | { | |||
struct istream *input; | struct istream *input; | |||
const char *path, *line; | const char *path, *line; | |||
path = t_strconcat(doveadm_settings->base_dir, "/master", NULL); | path = t_strconcat(doveadm_settings->base_dir, "/master", NULL); | |||
skipping to change at line 257 | skipping to change at line 257 | |||
if (line == NULL) { | if (line == NULL) { | |||
i_error("read(%s) failed: %s", i_stream_get_name(input), | i_error("read(%s) failed: %s", i_stream_get_name(input), | |||
i_stream_get_error(input)); | i_stream_get_error(input)); | |||
doveadm_exit_code = EX_TEMPFAIL; | doveadm_exit_code = EX_TEMPFAIL; | |||
} | } | |||
alarm(0); | alarm(0); | |||
i_stream_destroy(&input); | i_stream_destroy(&input); | |||
} | } | |||
struct doveadm_cmd_ver2 doveadm_cmd_stop_ver2 = { | struct doveadm_cmd_ver2 doveadm_cmd_stop_ver2 = { | |||
.old_cmd = cmd_stop, | .cmd = cmd_stop, | |||
.name = "stop", | .name = "stop", | |||
.usage = "", | .usage = "", | |||
DOVEADM_CMD_PARAMS_START | DOVEADM_CMD_PARAMS_START | |||
DOVEADM_CMD_PARAMS_END | DOVEADM_CMD_PARAMS_END | |||
}; | }; | |||
struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2 = { | struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2 = { | |||
.old_cmd = cmd_reload, | .cmd = cmd_reload, | |||
.name = "reload", | .name = "reload", | |||
.usage = "", | .usage = "", | |||
DOVEADM_CMD_PARAMS_START | DOVEADM_CMD_PARAMS_START | |||
DOVEADM_CMD_PARAMS_END | DOVEADM_CMD_PARAMS_END | |||
}; | }; | |||
struct doveadm_cmd_ver2 doveadm_cmd_service_stop_ver2 = { | struct doveadm_cmd_ver2 doveadm_cmd_service_stop_ver2 = { | |||
.cmd = cmd_service_stop, | .cmd = cmd_service_stop, | |||
.name = "service stop", | .name = "service stop", | |||
.usage = "<service> [<service> [...]]", | .usage = "<service> [<service> [...]]", | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 4 lines changed or added |