From ceb3e68fabb71e07a2444716e3045866a83d46d7 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 16 Aug 2018 14:47:11 +0200 Subject: [PATCH] bankd: Include worker state and file/line in LOGW output Change-Id: I00974d7f567ec1d3142727d455549c76ec974a03 --- src/bankd_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bankd_main.c b/src/bankd_main.c index 955a432..beb39ed 100644 --- a/src/bankd_main.c +++ b/src/bankd_main.c @@ -116,9 +116,6 @@ if (rv != SCARD_S_SUCCESS) { \ printf(text ": OK\n\n"); \ } -#define LOGW(w, fmt, args...) \ - printf("[%u] " fmt, (w)->num, args) - struct value_string worker_state_names[] = { { BW_ST_INIT, "INIT" }, { BW_ST_ACCEPTING, "ACCEPTING" }, @@ -129,6 +126,10 @@ struct value_string worker_state_names[] = { { 0, NULL } }; +#define LOGW(w, fmt, args...) \ + printf("[%03u %s] %s:%u " fmt, (w)->num, get_value_string(worker_state_names, (w)->state), \ + __FILE__, __LINE__, ## args) + static void worker_set_state(struct bankd_worker *worker, enum bankd_worker_state new_state) { LOGW(worker, "Changing state to %s\n", get_value_string(worker_state_names, new_state));