director: Add struct director.event

diff --git a/src/director/director.c b/src/director/director.c
index 1b0a9305acd07c32a350ca05f5640fb08d303e3d..6b518646f7e8b8ac4539ca3359c46c742a2a1576 100644 (file)
--- a/src/director/director.c
+++ b/src/director/director.c
@@ -41,6 +41,10 @@ const char *user_kill_state_names[USER_KILL_STATE_DELAY+1] = {
        "delay",
 };
 
+static struct event_category event_category_director = {
+       .name = "director",
+};
+
 static struct log_throttle *user_move_throttle;
 static struct log_throttle *user_kill_fail_throttle;
 
@@ -1445,6 +1449,8 @@ director_init(const struct director_settings *set,
        dir->self_ip = *listen_ip;
        dir->state_change_callback = callback;
        dir->kick_callback = kick_callback;
+       dir->event = event_create(NULL);
+       event_add_category(dir->event, &event_category_director);
        i_array_init(&dir->dir_hosts, 16);
        i_array_init(&dir->pending_requests, 16);
        i_array_init(&dir->connections, 8);
@@ -1488,6 +1494,7 @@ void director_deinit(struct director **_dir)
        array_free(&dir->pending_requests);
        array_free(&dir->dir_hosts);
        array_free(&dir->connections);
+       event_unref(&dir->event);
        i_free(dir);
 }
 

diff --git a/src/director/director.h b/src/director/director.h
index ef51381536d57b5fce8d1d5280fcba7bf9255077..b4928d3d8cb20e2b7a6d31dc544e3623f8f0195e 100644 (file)
--- a/src/director/director.h
+++ b/src/director/director.h
@@ -101,6 +101,7 @@ struct director_kill_context {
 };
 
 struct director {
+       struct event *event;
        const struct director_settings *set;
 
        /* IP and port of this director. self_host->ip/port must equal these. */

diff --git a/src/director/main.c b/src/director/main.c
index e73cc61353134e8a5bc45bb365f8d41de4c0f56c..7cf74260ab699c3f3fee9923eed6698cc4b78d67 100644 (file)
--- a/src/director/main.c
+++ b/src/director/main.c
@@ -346,6 +346,7 @@ int main(int argc, char *argv[])
        main_preinit();
        director->test_port = test_port;
        director_debug = debug;
+       event_set_forced_debug(director->event, debug);
        director_connect(director, "Initial connection");
 
        if (director->test_port != 0) {