dovecot-2.2: login proxy: Separate admin kicks, director kicks a...
dovecot at dovecot.org
dovecot at dovecot.org
Wed Oct 21 12:50:43 UTC 2015
details: http://hg.dovecot.org/dovecot-2.2/rev/a98aaaf55b13
changeset: 19327:a98aaaf55b13
user: Timo Sirainen <tss at iki.fi>
date: Wed Oct 21 15:50:31 2015 +0300
description:
login proxy: Separate admin kicks, director kicks and shutdowns in log messages.
diffstat:
src/login-common/login-proxy.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diffs (41 lines):
diff -r 098de79b89c8 -r a98aaaf55b13 src/login-common/login-proxy.c
--- a/src/login-common/login-proxy.c Wed Oct 21 13:32:58 2015 +0300
+++ b/src/login-common/login-proxy.c Wed Oct 21 15:50:31 2015 +0300
@@ -22,7 +22,9 @@
#define LOGIN_PROXY_DIE_IDLE_SECS 2
#define LOGIN_PROXY_IPC_PATH "ipc-proxy"
#define LOGIN_PROXY_IPC_NAME "proxy"
-#define KILLED_BY_ADMIN_REASON "Killed by admin"
+#define KILLED_BY_ADMIN_REASON "Kicked by admin"
+#define KILLED_BY_DIRECTOR_REASON "Kicked via director"
+#define KILLED_BY_SHUTDOWN_REASON "Process shutting down"
#define PROXY_IMMEDIATE_FAILURE_SECS 30
#define PROXY_CONNECT_RETRY_MSECS 1000
#define PROXY_DISCONNECT_INTERVAL_MSECS 100
@@ -758,7 +760,7 @@
static void proxy_kill_idle(struct login_proxy *proxy)
{
- login_proxy_free_reason(&proxy, KILLED_BY_ADMIN_REASON);
+ login_proxy_free_reason(&proxy, KILLED_BY_SHUTDOWN_REASON);
}
void login_proxy_kill_idle(void)
@@ -843,7 +845,7 @@
if (director_username_hash(proxy->client) == hash &&
!net_ip_compare(&proxy->ip, &except_ip)) {
- login_proxy_free_delayed(&proxy, KILLED_BY_ADMIN_REASON);
+ login_proxy_free_delayed(&proxy, KILLED_BY_DIRECTOR_REASON);
count++;
}
}
@@ -914,7 +916,7 @@
while (login_proxies != NULL) {
proxy = login_proxies;
- login_proxy_free_reason(&proxy, KILLED_BY_ADMIN_REASON);
+ login_proxy_free_reason(&proxy, KILLED_BY_SHUTDOWN_REASON);
}
while (login_proxies_disconnecting != NULL)
login_proxy_free_final(login_proxies_disconnecting);
More information about the dovecot-cvs
mailing list