From 61bb636e42fd90549afb3aa0b4c648477b3f5989 Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Fri, 19 Jun 2020 01:05:58 +0200 Subject: Bunch of minor fixes --- idle.c | 3 ++- main.c | 2 +- uring.c | 8 +++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/idle.c b/idle.c index 972d439..8fac1f0 100644 --- a/idle.c +++ b/idle.c @@ -297,7 +297,8 @@ idle_check_connected_cb(struct cfg *cfg, struct connection *conn, bool connected char hostname[INET6_ADDRSTRLEN]; if (!connected) { - error("idle check connection to remote server (%s) failed\n", + debug(DBG_IDLE, + "idle check connection to remote server (%s) failed\n", idle->server->name); idle->server->idle_count = 0; return; diff --git a/main.c b/main.c index ac6a385..e748ff6 100644 --- a/main.c +++ b/main.c @@ -337,7 +337,7 @@ usage(int argc, char **argv, bool invalid) info("Usage: %s [OPTIONS]\n" "\n" "Valid options:\n" - " -h, --homedir=DIR\tlook for configuration files in DIR\n" + " -H, --homedir=DIR\tlook for configuration files in DIR\n" " -u, --user=USER\trun as USER\n" " -D, --daemonize\trun in daemon mode (disables stderr output)\n" " -l, --logfile=FILE\tlog to FILE instead of stderr\n" diff --git a/uring.c b/uring.c index 0afa5f1..b7450d6 100644 --- a/uring.c +++ b/uring.c @@ -617,7 +617,8 @@ uring_init(struct cfg *cfg) if (io_uring_queue_init_params(4096, &uev->uring, &uev->uring_params) < 0) perrordie("io_uring_queue_init_params"); - verbose("uring initialized, features: 0x%08x\n", uev->uring_params.features); + debug(DBG_UR, "uring initialized, features: 0x%08x\n", + uev->uring_params.features); uring_task_init(&uev->task, "uev", &cfg->task, uring_free); cfg->uev = uev; @@ -628,10 +629,7 @@ static inline void uring_print_cqe(struct cfg *cfg, const char *type, struct uring_task *task, struct io_uring_cqe *cqe) { - if (!debug_enabled(DBG_UR)) - return; - - error("got CQE " + debug(DBG_UR, "got CQE " "(type: %s, res: %i (%s), task: %s (%p), fd: %i, cb: %p)\n", type, cqe->res, -- cgit v1.2.3