summaryrefslogtreecommitdiff
path: root/degesch.c
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2015-07-05 01:56:00 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2015-07-05 02:16:43 +0200
commitb1dd34a7ba1d7558763fcf1f1528d34fc1856829 (patch)
tree533d2ad1e83d424e0242dfb2207890a08619723f /degesch.c
parent9b41256ebf21a118b3a1a68b9bf2acfd75a7f5be (diff)
downloadxK-b1dd34a7ba1d7558763fcf1f1528d34fc1856829.tar.gz
xK-b1dd34a7ba1d7558763fcf1f1528d34fc1856829.tar.xz
xK-b1dd34a7ba1d7558763fcf1f1528d34fc1856829.zip
degesch: set "user_data" while loading config
It'd be quite wrong to call "on_change" on them without this.
Diffstat (limited to 'degesch.c')
-rw-r--r--degesch.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/degesch.c b/degesch.c
index b56f36b..80625a0 100644
--- a/degesch.c
+++ b/degesch.c
@@ -1576,17 +1576,13 @@ static struct config_schema g_config_attributes[] =
static void
load_config_behaviour (struct config_item_ *subtree, void *user_data)
{
- (void) user_data;
- // TODO: assign user_data to all the subitems
- config_schema_apply_to_object (g_config_behaviour, subtree);
+ config_schema_apply_to_object (g_config_behaviour, subtree, user_data);
}
static void
load_config_attributes (struct config_item_ *subtree, void *user_data)
{
- (void) user_data;
- // TODO: assign user_data to all the subitems
- config_schema_apply_to_object (g_config_attributes, subtree);
+ config_schema_apply_to_object (g_config_attributes, subtree, user_data);
}
static void
@@ -8398,9 +8394,6 @@ load_server_from_config (struct app_context *ctx,
struct server *s = xmalloc (sizeof *s);
server_init (s, &ctx->poller);
- // TODO: assign user_data (s) to all the subitems
- config_schema_apply_to_object (g_config_server, subtree);
-
s->ctx = ctx;
s->name = xstrdup (name);
str_map_set (&ctx->servers, s->name, s);
@@ -8415,6 +8408,9 @@ load_server_from_config (struct app_context *ctx,
buffer_add (ctx, buffer);
buffer_activate (ctx, buffer);
+ // This fires any "on_change" callbacks
+ config_schema_apply_to_object (g_config_server, subtree, s);
+
// XXX: is this desirable in here? I think we should do it only when
// actually creating a new server instead of every time we load them.
struct error *e = NULL;