Skip to content

Commit

Permalink
director: Call state_change_callback on user move timeout.
Browse files Browse the repository at this point in the history
  • Loading branch information
sirainen authored and GitLab committed Oct 25, 2016
1 parent 3c30016 commit ffedd89
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/director/director.c
Expand Up @@ -925,6 +925,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,
Expand Down
1 change: 1 addition & 0 deletions src/director/director.h
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/director/main.c
Expand Up @@ -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;
Expand Down

0 comments on commit ffedd89

Please sign in to comment.