gfwleak/tsg-packetadapter
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhance http healthcheck

Browse Source
This commit is contained in:
luwenpeng
2024-11-21 10:20:23 +08:00
parent a51344bba3
commit 8f59c39496
2 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
common/src/http_healthcheck.cpp
View File

@@ -12,6 +12,8 @@ struct http_status_ctx
{ {
pthread_t pthread; pthread_t pthread;
struct event_base *base; struct event_base *base;
struct event *ev;
struct evhttp *http;
unsigned int enable; unsigned int enable;
unsigned int port; unsigned int port;
@@ -25,19 +27,67 @@ static void http_callback(struct evhttp_request *req, void *arg)
evhttp_send_reply(req, HTTP_OK, "", NULL); evhttp_send_reply(req, HTTP_OK, "", NULL);
} }
static void gc_callback(evutil_socket_t fd, short what, void *arg)
{
// do nothing
// add gc_callback to avoid event_base_dispatch blocking, handle event_base_loopbreak inmediately
}
static void *http_healthcheck_thread(void *arg) static void *http_healthcheck_thread(void *arg)
{ {
printf("http_healthcheck_thread running (%s:%d/%s)\n", g_ctx.addr, g_ctx.port, g_ctx.path); struct timeval gc_delay = {0, 500 * 1000}; // Microseconds, we set 500 miliseconds here.
printf("[http_healthcheck_thread]: running (listen: %s:%d path: %s)\n", g_ctx.addr, g_ctx.port, g_ctx.path);
g_ctx.base = event_base_new(); g_ctx.base = event_base_new();
struct evhttp *http = evhttp_new(g_ctx.base); if (g_ctx.base == NULL)
evhttp_set_cb(http, g_ctx.path, http_callback, NULL); {
evhttp_bind_socket(http, g_ctx.addr, g_ctx.port); printf("[http_healthcheck_thread]: event_base_new failed\n");
event_base_dispatch(g_ctx.base); goto end;
evhttp_free(http); }
event_base_free(g_ctx.base);
printf("http_healthcheck_thread exit\n"); g_ctx.ev = event_new(g_ctx.base, -1, EV_PERSIST, gc_callback, NULL);
if (g_ctx.ev == NULL)
{
printf("[http_healthcheck_thread]: event_new failed\n");
goto end;
}
if (evtimer_add(g_ctx.ev, &gc_delay) < 0)
{
printf("[http_healthcheck_thread]: evtimer_add failed\n");
goto end;
}
g_ctx.http = evhttp_new(g_ctx.base);
if (evhttp_set_cb(g_ctx.http, g_ctx.path, http_callback, NULL) < 0)
{
printf("[http_healthcheck_thread]: evhttp_set_cb failed\n");
goto end;
}
if (evhttp_bind_socket(g_ctx.http, g_ctx.addr, g_ctx.port) < 0)
{
printf("[http_healthcheck_thread]: evhttp_bind_socket failed\n");
goto end;
}
event_base_dispatch(g_ctx.base);
end:
if (g_ctx.http)
{
evhttp_free(g_ctx.http);
}
if (g_ctx.ev)
{
event_free(g_ctx.ev);
}
if (g_ctx.base)
{
event_base_free(g_ctx.base);
}
printf("[http_healthcheck_thread]: exit\n");
return NULL; return NULL;
} }

24
platform/src/packet_adapter.cpp
View File

@@ -33,7 +33,6 @@ struct thread
struct runtime_ctx struct runtime_ctx
{ {
int enable_debug;
int need_stop; int need_stop;
struct metrics metrics; struct metrics metrics;
@@ -92,16 +91,6 @@ error_out:
static void signal_handler(int signo) static void signal_handler(int signo)
{ {
if (signo == SIGUSR1)
{
runtime->enable_debug = 1;
LOG_ERROR("%s: received SIGUSR1, enable debug", LOG_MAIN);
}
if (signo == SIGUSR2)
{
runtime->enable_debug = 0;
LOG_ERROR("%s: received SIGUSR2, disable debug", LOG_MAIN);
}
if (signo == SIGHUP) if (signo == SIGHUP)
{ {
LOG_RELOAD(); LOG_RELOAD();
@@ -130,9 +119,6 @@ static void usage(char *cmd)
fprintf(stderr, " -v -- show version\n"); fprintf(stderr, " -v -- show version\n");
fprintf(stderr, " -d -- run daemon\n"); fprintf(stderr, " -d -- run daemon\n");
fprintf(stderr, " -h -- show help\n"); fprintf(stderr, " -h -- show help\n");
fprintf(stderr, "Signal: \n");
fprintf(stderr, " kill -s SIGUSR1 `pidof %s` -- enable debug\n", cmd);
fprintf(stderr, " kill -s SIGUSR2 `pidof %s` -- disable debug\n", cmd);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
@@ -164,16 +150,6 @@ int main(int argc, char **argv)
LOG_ERROR("%s: TSG Packet Adapter Engine, Version: %s Start ...", LOG_MAIN, Packet_Adapter_Version); LOG_ERROR("%s: TSG Packet Adapter Engine, Version: %s Start ...", LOG_MAIN, Packet_Adapter_Version);
if (signal(SIGUSR1, signal_handler) == SIG_ERR)
{
LOG_ERROR("%s: failed at signal(SIGUSR1), %d: %s", LOG_MAIN, errno, strerror(errno));
goto error;
}
if (signal(SIGUSR2, signal_handler) == SIG_ERR)
{
LOG_ERROR("%s: failed at signal(SIGUSR2), %d: %s", LOG_MAIN, errno, strerror(errno));
goto error;
}
if (signal(SIGHUP, signal_handler) == SIG_ERR) if (signal(SIGHUP, signal_handler) == SIG_ERR)
{ {
LOG_ERROR("%s: failed at signal(SIGHUP), %d: %s", LOG_MAIN, errno, strerror(errno)); LOG_ERROR("%s: failed at signal(SIGHUP), %d: %s", LOG_MAIN, errno, strerror(errno));