From 6f4ef8c4be5c3d443cfa25b2e7b7b95b6676fe4d Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 24 Oct 2016 19:59:54 +0300 Subject: [PATCH] director: Call state_change_callback on user move timeout. --- src/director/director.c | 4 ++++ src/director/director.h | 1 + src/director/main.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/director/director.c b/src/director/director.c index 9f1999a7ca..0050948bd0 100644 --- a/src/director/director.c +++ b/src/director/director.c @@ -927,6 +927,10 @@ static void director_user_move_timeout(struct user *user) user->kill_state = USER_KILL_STATE_NONE; timeout_remove(&user->to_move); + + /* FIXME: shouldn't use global director, but for now there's no easy + way to get access to it otherwise */ + director->state_change_callback(director); } void director_move_user(struct director *dir, struct director_host *src, diff --git a/src/director/director.h b/src/director/director.h index 5e4b1327ac..64681cfe69 100644 --- a/src/director/director.h +++ b/src/director/director.h @@ -100,6 +100,7 @@ struct director { }; extern bool director_debug; +extern struct director *director; /* FIXME: shouldn't be global */ /* Create a new director. If listen_ip specifies an actual IP, it's used with listen_port for finding ourself from the director_servers setting. diff --git a/src/director/main.c b/src/director/main.c index 243f7098e0..a65ed9d59c 100644 --- a/src/director/main.c +++ b/src/director/main.c @@ -35,7 +35,7 @@ enum director_socket_type { DIRECTOR_SOCKET_TYPE_DOVEADM }; -static struct director *director; +struct director *director; static struct notify_connection *notify_conn; static struct timeout *to_proctitle_refresh; static ARRAY(enum director_socket_type) listener_socket_types; -- 2.47.3