From 15abd17b9cfa929f20592ad3ee933ea33affd0d0 Mon Sep 17 00:00:00 2001 From: hexian000 Date: Sun, 31 Dec 2023 10:59:25 +0800 Subject: [PATCH] app: logging improvements Signed-off-by: hexian000 --- src/main.c | 5 ++--- src/obfs.c | 10 +++++----- src/server.c | 12 ++++++------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main.c b/src/main.c index f062af3..58f3e1c 100644 --- a/src/main.c +++ b/src/main.c @@ -193,16 +193,15 @@ int main(int argc, char **argv) } /* start event loop */ - LOGN_F("%s start", runmode_str(conf->mode)); ev_run(loop, 0); server_stop(s); server_free(s); - LOGN_F("%s shutdown", runmode_str(conf->mode)); + LOGN_F("%s shutdown gracefully", runmode_str(conf->mode)); ev_loop_destroy(loop); conf_free(conf); - LOGI("program terminated normally."); + LOGD("program terminated normally"); return EXIT_SUCCESS; } diff --git a/src/obfs.c b/src/obfs.c index e490049..1b0425f 100644 --- a/src/obfs.c +++ b/src/obfs.c @@ -401,11 +401,6 @@ static bool obfs_bind(struct obfs *restrict obfs, const struct sockaddr *sa) const int err = errno; LOGW_F("cap bind: %s", strerror(err)); } - if (LOGLEVEL(DEBUG)) { - char addr_str[64]; - format_sa(sa, addr_str, sizeof(addr_str)); - LOG_F(DEBUG, "obfs: cap bind %s", addr_str); - } struct sock_filter filter[32]; struct sock_fprog fprog = { .filter = filter, @@ -421,6 +416,11 @@ static bool obfs_bind(struct obfs *restrict obfs, const struct sockaddr *sa) const int err = errno; LOGW_F("cap filter: %s", strerror(err)); } + if (LOGLEVEL(NOTICE)) { + char addr_str[64]; + format_sa(sa, addr_str, sizeof(addr_str)); + LOG_F(NOTICE, "obfs: bind %s", addr_str); + } return true; } diff --git a/src/server.c b/src/server.c index 84cd1d5..117f1e0 100644 --- a/src/server.c +++ b/src/server.c @@ -55,14 +55,14 @@ tcp_listen(const struct config *restrict conf, const struct sockaddr *sa) /* Bind socket to address */ if (bind(fd, sa, getsocklen(sa)) != 0) { const int err = errno; - LOGE_F("bind error: %s", strerror(err)); + LOGE_F("tcp bind: %s", strerror(err)); CLOSE_FD(fd); return -1; } /* Start listening on the socket */ if (listen(fd, SOMAXCONN)) { const int err = errno; - LOGE_F("listen error: %s", strerror(err)); + LOGE_F("tcp listen: %s", strerror(err)); CLOSE_FD(fd); return -1; } @@ -90,10 +90,10 @@ static bool listener_start(struct server *restrict s) w_accept->data = s; ev_io_start(s->loop, w_accept); l->fd = fd; - if (LOGLEVEL(INFO)) { + if (LOGLEVEL(NOTICE)) { char addr_str[64]; format_sa(&addr.sa, addr_str, sizeof(addr_str)); - LOG_F(INFO, "listen at: %s", addr_str); + LOG_F(NOTICE, "listen at %s", addr_str); } } @@ -112,10 +112,10 @@ static bool listener_start(struct server *restrict s) w_accept->data = s; ev_io_start(s->loop, w_accept); l->fd_http = fd; - if (LOGLEVEL(INFO)) { + if (LOGLEVEL(NOTICE)) { char addr_str[64]; format_sa(&addr.sa, addr_str, sizeof(addr_str)); - LOG_F(INFO, "http listen at: %s", addr_str); + LOG_F(NOTICE, "http listen at %s", addr_str); } }