Skip to content

Commit

Permalink
doveadm director: Improve logging unexpected disconnections from dire…
Browse files Browse the repository at this point in the history 
…ctor socket

Previously it just logged "failed", which wasn't very understandable.
  • Loading branch information
@sirainen @villesavolainen
sirainen authored and villesavolainen committed Sep 21, 2017
1 parent 1654e67 commit 9b30255
Showing 1 changed file with 35 additions and 34 deletions.
69 changes: 35 additions & 34 deletions src/doveadm/doveadm-director.c
View file
Expand Up @@ -136,6 +136,17 @@ cmd_director_init(struct doveadm_cmd_context *cctx)
return ctx;
}

static void director_disconnected(struct director_context *ctx)
{
i_assert(ctx->input->eof);
if (ctx->input->stream_errno != 0) {
i_error("read(%s) failed: %s", ctx->socket_path,
i_stream_get_error(ctx->input));
} else {
i_error("%s unexpectedly disconnected", ctx->socket_path);
}
doveadm_exit_code = EX_TEMPFAIL;
}

static void
cmd_director_status_user(struct director_context *ctx)
Expand All @@ -147,8 +158,7 @@ cmd_director_status_user(struct director_context *ctx)
ctx->tag != NULL ? ctx->tag : ""));
line = i_stream_read_next_line(ctx->input);
if (line == NULL) {
i_error("Lookup failed");
doveadm_exit_code = EX_TEMPFAIL;
director_disconnected(ctx);
return;
}

Expand Down Expand Up @@ -228,10 +238,8 @@ static void cmd_director_status(struct doveadm_cmd_context *cctx)
}
} T_END;
}
if (line == NULL) {
i_error("Director disconnected unexpectedly");
doveadm_exit_code = EX_TEMPFAIL;
}
if (line == NULL)
director_disconnected(ctx);
director_disconnect(ctx);
}

Expand Down Expand Up @@ -417,10 +425,8 @@ static void cmd_director_map(struct doveadm_cmd_context *cctx)
}
} T_END;
}
if (line == NULL) {
i_error("Director disconnected unexpectedly");
doveadm_exit_code = EX_TEMPFAIL;
}
if (line == NULL)
director_disconnected(ctx);
deinit:
director_disconnect(ctx);
hash_table_destroy(&users);
Expand Down Expand Up @@ -484,9 +490,10 @@ cmd_director_add_or_update(struct doveadm_cmd_context *cctx, bool update)
}
for (i = 0; i < ips_count; i++) {
line = i_stream_read_next_line(ctx->input);
if (line == NULL || strcmp(line, "OK") != 0) {
if (line == NULL)
director_disconnected(ctx);
else if (strcmp(line, "OK") != 0) {
i_error("%s: %s\n", net_ip2addr(&ips[i]),
line == NULL ? "failed" :
strcmp(line, "NOTFOUND") == 0 ?
"doesn't exist" : line);
doveadm_exit_code = EX_TEMPFAIL;
Expand Down Expand Up @@ -538,9 +545,10 @@ cmd_director_ipcmd(const char *cmd_name, const char *success_result,
net_ip2addr(&ips[i]));
if (doveadm_exit_code == 0)
doveadm_exit_code = DOVEADM_EX_NOTFOUND;
} else if (line == NULL || strcmp(line, "OK") != 0) {
i_error("%s: %s\n", net_ip2addr(&ips[i]),
line == NULL ? "failed" : line);
} else if (line == NULL) {
director_disconnected(ctx);
} else if (strcmp(line, "OK") != 0) {
i_error("%s: %s\n", net_ip2addr(&ips[i]), line);
doveadm_exit_code = EX_TEMPFAIL;
} else if (doveadm_verbose) {
i_info("%s: %s\n", net_ip2addr(&ips[i]), success_result);
Expand Down Expand Up @@ -588,8 +596,7 @@ static void cmd_director_move(struct doveadm_cmd_context *cctx)
"USER-MOVE\t%u\t%s\n", user_hash, ip_str));
line = i_stream_read_next_line(ctx->input);
if (line == NULL) {
i_error("failed");
doveadm_exit_code = EX_TEMPFAIL;
director_disconnected(ctx);
} else if (strcmp(line, "OK") == 0) {
if (doveadm_verbose)
i_info("User hash %u moved to %s\n", user_hash, ip_str);
Expand Down Expand Up @@ -634,8 +641,7 @@ static void cmd_director_kick(struct doveadm_cmd_context *cctx)

line = i_stream_read_next_line(ctx->input);
if (line == NULL) {
i_error("failed");
doveadm_exit_code = EX_TEMPFAIL;
director_disconnected(ctx);
} else if (strcmp(line, "OK") == 0) {
if (doveadm_verbose)
i_info("User %s kicked", ctx->user);
Expand All @@ -662,8 +668,7 @@ static void cmd_director_flush_all(struct director_context *ctx)

line = i_stream_read_next_line(ctx->input);
if (line == NULL) {
i_error("failed");
doveadm_exit_code = EX_TEMPFAIL;
director_disconnected(ctx);
} else if (strcmp(line, "OK") != 0) {
i_error("failed: %s", line);
doveadm_exit_code = EX_TEMPFAIL;
Expand Down Expand Up @@ -722,9 +727,10 @@ static void cmd_director_flush(struct doveadm_cmd_context *cctx)
net_ip2addr(&ips[i]));
if (doveadm_exit_code == 0)
doveadm_exit_code = DOVEADM_EX_NOTFOUND;
} else if (line == NULL || strcmp(line, "OK") != 0) {
i_warning("%s: %s", net_ip2addr(&ips[i]),
line == NULL ? "failed" : line);
} else if (line == NULL) {
director_disconnected(ctx);
} else if (strcmp(line, "OK") != 0) {
i_warning("%s: %s", net_ip2addr(&ips[i]), line);
doveadm_exit_code = EX_TEMPFAIL;
} else if (doveadm_verbose) {
i_info("%s: flushed", net_ip2addr(&ips[i]));
Expand Down Expand Up @@ -782,10 +788,8 @@ static void cmd_director_dump(struct doveadm_cmd_context *cctx)
doveadm_print(line);
doveadm_print("");
}
if (line == NULL) {
i_error("Director disconnected unexpectedly");
doveadm_exit_code = EX_TEMPFAIL;
}
if (line == NULL)
director_disconnected(ctx);
director_disconnect(ctx);
}

Expand All @@ -796,8 +800,7 @@ static void director_read_ok_reply(struct director_context *ctx)

line = i_stream_read_next_line(ctx->input);
if (line == NULL) {
i_error("Director disconnected unexpectedly");
doveadm_exit_code = EX_TEMPFAIL;
director_disconnected(ctx);
} else if (strcmp(line, "NOTFOUND") == 0) {
i_error("Not found");
doveadm_exit_code = DOVEADM_EX_NOTFOUND;
Expand Down Expand Up @@ -889,10 +892,8 @@ static void cmd_director_ring_status(struct doveadm_cmd_context *cctx)
}
} T_END;
}
if (line == NULL) {
i_error("Director disconnected unexpectedly");
doveadm_exit_code = EX_TEMPFAIL;
}
if (line == NULL)
director_disconnected(ctx);
director_disconnect(ctx);
}

Expand Down

0 comments on commit 9b30255

Please sign in to comment.