dovecot-2.0: doveadm proxy: s/kill/kick/ and related internal co...
dovecot at dovecot.org
dovecot at dovecot.org
Tue May 24 20:07:32 EEST 2011
details: http://hg.dovecot.org/dovecot-2.0/rev/936f6c2ddfdd
changeset: 12827:936f6c2ddfdd
user: Timo Sirainen <tss at iki.fi>
date: Tue May 24 20:06:24 2011 +0300
description:
doveadm proxy: s/kill/kick/ and related internal code changes.
Mainly for consistency, because "doveadm kick" already existed.
diffstat:
src/director/director.c | 2 +-
src/doveadm/doveadm-proxy.c | 18 +++++++++---------
src/login-common/login-proxy.c | 16 ++++++++--------
3 files changed, 18 insertions(+), 18 deletions(-)
diffs (122 lines):
diff -r 9127a988acb8 -r 936f6c2ddfdd src/director/director.c
--- a/src/director/director.c Mon May 23 16:26:21 2011 +0300
+++ b/src/director/director.c Tue May 24 20:06:24 2011 +0300
@@ -488,7 +488,7 @@
user->to_move = timeout_add(DIRECTOR_USER_MOVE_TIMEOUT_MSECS,
director_user_move_timeout, user);
user->kill_state = USER_KILL_STATE_KILLING;
- cmd = t_strdup_printf("proxy\t*\tKILL-DIRECTOR-HASH\t%u",
+ cmd = t_strdup_printf("proxy\t*\tKICK-DIRECTOR-HASH\t%u",
username_hash);
ipc_client_cmd(dir->ipc_proxy, cmd,
director_kill_user_callback, ctx);
diff -r 9127a988acb8 -r 936f6c2ddfdd src/doveadm/doveadm-proxy.c
--- a/src/doveadm/doveadm-proxy.c Mon May 23 16:26:21 2011 +0300
+++ b/src/doveadm/doveadm-proxy.c Tue May 24 20:06:24 2011 +0300
@@ -80,35 +80,35 @@
ipc_client_deinit(&ctx->ipc);
}
-static void cmd_proxy_kill_callback(enum ipc_client_cmd_state state,
+static void cmd_proxy_kick_callback(enum ipc_client_cmd_state state,
const char *data, void *context ATTR_UNUSED)
{
switch (state) {
case IPC_CLIENT_CMD_STATE_REPLY:
return;
case IPC_CLIENT_CMD_STATE_OK:
- printf("%s connections killed\n", data);
+ printf("%s connections kicked\n", data);
break;
case IPC_CLIENT_CMD_STATE_ERROR:
- i_error("KILL failed: %s", data);
+ i_error("KICK failed: %s", data);
break;
}
io_loop_stop(current_ioloop);
}
-static void cmd_proxy_kill(int argc, char *argv[])
+static void cmd_proxy_kick(int argc, char *argv[])
{
struct proxy_context *ctx;
- ctx = cmd_proxy_init(argc, argv, "a:", cmd_proxy_kill);
+ ctx = cmd_proxy_init(argc, argv, "a:", cmd_proxy_kick);
if (argv[optind] == NULL) {
- proxy_cmd_help(cmd_proxy_kill);
+ proxy_cmd_help(cmd_proxy_kick);
return;
}
- ipc_client_cmd(ctx->ipc, t_strdup_printf("proxy\t*\tKILL\t%s", argv[optind]),
- cmd_proxy_kill_callback, NULL);
+ ipc_client_cmd(ctx->ipc, t_strdup_printf("proxy\t*\tKICK\t%s", argv[optind]),
+ cmd_proxy_kick_callback, NULL);
io_loop_run(current_ioloop);
ipc_client_deinit(&ctx->ipc);
}
@@ -116,7 +116,7 @@
struct doveadm_cmd doveadm_cmd_proxy[] = {
{ cmd_proxy_list, "proxy list",
"[-a <ipc socket path>]" },
- { cmd_proxy_kill, "proxy kill",
+ { cmd_proxy_kick, "proxy kick",
"[-a <ipc socket path>] <user>" }
};
diff -r 9127a988acb8 -r 936f6c2ddfdd src/login-common/login-proxy.c
--- a/src/login-common/login-proxy.c Mon May 23 16:26:21 2011 +0300
+++ b/src/login-common/login-proxy.c Tue May 24 20:06:24 2011 +0300
@@ -577,7 +577,7 @@
}
static void
-login_proxy_cmd_kill(struct ipc_cmd *cmd, const char *const *args)
+login_proxy_cmd_kick(struct ipc_cmd *cmd, const char *const *args)
{
struct login_proxy *proxy, *next;
unsigned int count = 0;
@@ -599,7 +599,7 @@
next = proxy->next;
if (strcmp(proxy->client->virtual_user, args[0]) == 0) {
- client_destroy(proxy->client, "Connection killed");
+ client_destroy(proxy->client, "Connection kicked");
count++;
}
}
@@ -620,7 +620,7 @@
}
static void
-login_proxy_cmd_kill_director_hash(struct ipc_cmd *cmd, const char *const *args)
+login_proxy_cmd_kick_director_hash(struct ipc_cmd *cmd, const char *const *args)
{
struct login_proxy *proxy, *next;
unsigned int hash, count = 0;
@@ -642,7 +642,7 @@
next = proxy->next;
if (director_username_hash(proxy->client->virtual_user) == hash) {
- client_destroy(proxy->client, "Connection killed");
+ client_destroy(proxy->client, "Connection kicked");
count++;
}
}
@@ -683,10 +683,10 @@
const char *name = args[0];
args++;
- if (strcmp(name, "KILL") == 0)
- login_proxy_cmd_kill(cmd, args);
- else if (strcmp(name, "KILL-DIRECTOR-HASH") == 0)
- login_proxy_cmd_kill_director_hash(cmd, args);
+ if (strcmp(name, "KICK") == 0)
+ login_proxy_cmd_kick(cmd, args);
+ else if (strcmp(name, "KICK-DIRECTOR-HASH") == 0)
+ login_proxy_cmd_kick_director_hash(cmd, args);
else if (strcmp(name, "LIST") == 0)
login_proxy_cmd_list(cmd, args);
else
More information about the dovecot-cvs
mailing list