diff options
Diffstat (limited to 'minecproxy/server-config.c')
| -rw-r--r-- | minecproxy/server-config.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/minecproxy/server-config.c b/minecproxy/server-config.c index 7009952..959f1d0 100644 --- a/minecproxy/server-config.c +++ b/minecproxy/server-config.c @@ -39,18 +39,18 @@ static void server_cfg_read_cb(struct uring_task *task, int res) assert_task_alive(DBG_CFG, task); if (res <= 0) { - error("error reading config file for %s: %s", server->name, + error("error reading config file for %s: %s", server->scfg.name, strerror(-res)); server_delete(server); } - debug(DBG_CFG, "%s: parsing cfg (%i bytes)", server->name, res); + debug(DBG_CFG, "%s: parsing cfg (%i bytes)", server->scfg.name, res); uring_task_close_fd(&server->task); if (!scfg_parse(&server->scfg, server->tbuf.buf, true, &lineno, &error)) { error("%s: failed to parse config file, line %u: %s", - server->name, lineno, error); + server->scfg.name, lineno, error); server_delete(server); return; } @@ -74,12 +74,12 @@ static void server_cfg_open_cb(struct uring_task *task, int res) assert_task_alive(DBG_CFG, task); if (res < 0) { - error("open(%s) failed: %s", server->name, strerror(-res)); + error("open(%s) failed: %s", server->scfg.name, strerror(-res)); server_delete(server); return; } - debug(DBG_CFG, "reading server cfg %s (fd %i)", server->name, res); + debug(DBG_CFG, "reading server cfg %s (fd %i)", server->scfg.name, res); uring_task_set_fd(&server->task, res); uring_tbuf_read_until_eof(&server->task, server_cfg_read_cb); } @@ -184,8 +184,8 @@ static void inotify_cb(struct uring_task *task, int res) (IN_MOVED_TO | IN_CREATE | IN_CLOSE_WRITE)) { server = server_new(event->name); verbose("New server config file detected: %s", - server->name); - uring_openat(&server->task, server->name, + event->name); + uring_openat(&server->task, event->name, server_cfg_open_cb); } else error("inotify: unknown event: 0x%08x", event->mask); |