From 1000d1d8c860a44dad06c2e5c45b607213171b07 Mon Sep 17 00:00:00 2001 From: Sergey Khripchenko Date: Thu, 18 Oct 2018 04:52:14 -0700 Subject: [PATCH] FS-11467: [mod_verto] decreased logging level for log lines that are not errors/warnings --- src/mod/endpoints/mod_verto/mod_verto.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c index d48b53430e..e9f731419c 100644 --- a/src/mod/endpoints/mod_verto/mod_verto.c +++ b/src/mod/endpoints/mod_verto/mod_verto.c @@ -62,7 +62,8 @@ SWITCH_MODULE_DEFINITION(mod_verto, mod_verto_load, mod_verto_shutdown, mod_vert #define strerror_r(errno, buf, len) strerror_s(buf, len, errno) #endif -#define die(...) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, __VA_ARGS__); goto error +#define log_and_exit(severity, ...) switch_log_printf(SWITCH_CHANNEL_LOG, (severity), __VA_ARGS__); goto error +#define die(...) log_and_exit(SWITCH_LOG_WARNING, __VA_ARGS__) #define die_errno(fmt) do { char errbuf[BUFSIZ] = {0}; strerror_r(errno, (char *)&errbuf, sizeof(errbuf)); die(fmt ", errno=%d, %s\n", errno, (char *)&errbuf); } while(0) #define die_errnof(fmt, ...) do { char errbuf[BUFSIZ] = {0}; strerror_r(errno, (char *)&errbuf, sizeof(errbuf)); die(fmt ", errno=%d, %s\n", __VA_ARGS__, errno, (char *)&errbuf); } while(0) @@ -1800,8 +1801,8 @@ done: int pflags = switch_wait_sock(jsock->client_socket, 3000, SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP); if (jsock->drop) { die("%s Dropping Connection\n", jsock->name); } - if (pflags < 0 && (errno != EINTR)) { die_errnof("%s POLL FAILED", jsock->name); } - if (pflags & SWITCH_POLL_HUP) { die("%s POLL HANGUP DETECTED (peer closed its end of socket)\n", jsock->name); } + if (pflags < 0 && (errno != EINTR)) { die_errnof("%s POLL FAILED with %d", jsock->name, pflags); } + if (pflags & SWITCH_POLL_HUP) { log_and_exit(SWITCH_LOG_INFO, "%s POLL HANGUP DETECTED (peer closed its end of socket)\n", jsock->name); } if (pflags & SWITCH_POLL_ERROR) { die("%s POLL ERROR\n", jsock->name); } if (pflags & SWITCH_POLL_INVALID) { die("%s POLL INVALID SOCKET (not opened or already closed)\n", jsock->name); } if (pflags & SWITCH_POLL_READ) { @@ -1862,7 +1863,7 @@ static void client_run(jsock_t *jsock) ws_close(&jsock->ws, WS_NONE); goto error; } else { - die("%s WS SETUP FAILED\n", jsock->name); + log_and_exit(SWITCH_LOG_NOTICE, "%s WS SETUP FAILED\n", jsock->name); } } @@ -1870,8 +1871,8 @@ static void client_run(jsock_t *jsock) int pflags = switch_wait_sock(jsock->client_socket, 50, SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP); if (jsock->drop) { die("%s Dropping Connection\n", jsock->name); } - if (pflags < 0 && (errno != EINTR)) { die_errnof("%s POLL FAILED", jsock->name); } - if (pflags & SWITCH_POLL_HUP) { die("%s POLL HANGUP DETECTED (peer closed its end of socket)\n", jsock->name); } + if (pflags < 0 && (errno != EINTR)) { die_errnof("%s POLL FAILED with %d", jsock->name, pflags); } + if (pflags & SWITCH_POLL_HUP) { log_and_exit(SWITCH_LOG_INFO, "%s POLL HANGUP DETECTED (peer closed its end of socket)\n", jsock->name); } if (pflags & SWITCH_POLL_ERROR) { die("%s POLL ERROR\n", jsock->name); } if (pflags & SWITCH_POLL_INVALID) { die("%s POLL INVALID SOCKET (not opened or already closed)\n", jsock->name); } if (pflags & SWITCH_POLL_READ) { @@ -1883,7 +1884,7 @@ static void client_run(jsock_t *jsock) if (bytes < 0) { if (bytes == -WS_RECV_CLOSE) { - die("%s Client sent close request\n", jsock->name); + log_and_exit(SWITCH_LOG_INFO, "%s Client sent close request\n", jsock->name); } else { die("%s BAD READ %" SWITCH_SSIZE_T_FMT "\n", jsock->name, bytes); } @@ -4410,7 +4411,7 @@ static int profile_one_loop(verto_profile_t *profile) if ((res = switch_wait_socklist(pfds, max, 100)) < 0) { if (errno != EINTR) { - die_errnof("%s POLL FAILED", profile->name); + die_errnof("%s POLL FAILED with %d", profile->name, res); } } @@ -4419,7 +4420,7 @@ static int profile_one_loop(verto_profile_t *profile) } for (x = 0; x < max; x++) { - if (pfds[x].revents & SWITCH_POLL_HUP) { die("%s POLL HANGUP DETECTED (peer closed its end of socket)\n", profile->name); } + if (pfds[x].revents & SWITCH_POLL_HUP) { log_and_exit(SWITCH_LOG_INFO, "%s POLL HANGUP DETECTED (peer closed its end of socket)\n", profile->name); } if (pfds[x].revents & SWITCH_POLL_ERROR) { die("%s POLL ERROR\n", profile->name); } if (pfds[x].revents & SWITCH_POLL_INVALID) { die("%s POLL INVALID SOCKET (not opened or already closed)\n", profile->name); } if (pfds[x].revents & SWITCH_POLL_READ) { @@ -4523,9 +4524,9 @@ static int runtime(verto_profile_t *profile) } if (ok) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s MCAST Bound to %s:%d/%d\n", profile->name, profile->mcast_ip, profile->mcast_port, profile->mcast_port + 1); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s MCAST Bound to %s:%d/%d\n", profile->name, profile->mcast_ip, profile->mcast_port, profile->mcast_port + 1); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s MCAST Disabled\n", profile->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s MCAST Disabled\n", profile->name); } }