Skip to content
Extraits de code Groupes Projets
Vérifiée Valider f2d72067 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

MISC: Update log messages and update doc

parent 294ae70d
Branches
Étiquettes
Aucune requête de fusion associée trouvée
Pipeline #1994 réussi
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
- Check if downloaded karas are matroska files (only the magic number) - Check if downloaded karas are matroska files (only the magic number)
- Fix dl process with the repo module - Fix dl process with the repo module
- Bug fix: reduce libs to link to lkt (dear autoconf...) - Bug fix: reduce libs to link to lkt (dear autoconf...)
- Bug fix: fix #84, next and prev commands didn't worked correctly
- Bug fix: fix deadlock on next kara (the new aerobrin...)
# v2.2 (78143fa3) # v2.2 (78143fa3)
......
...@@ -76,5 +76,5 @@ the issue number and the target OS if possible. ...@@ -76,5 +76,5 @@ the issue number and the target OS if possible.
test lektor test lektor
When adding new fetures or solving issues / bugs, please edit the When adding new fetures or solving issues / bugs, please edit the
[CHANGELOG](CHANGELOG) file at the `# Next` section. This will help people know [CHANGELOG](CHANGELOG.md) file at the `# Next` section. This will help people
what has been done since the last version know what has been done since the last version.
...@@ -10,7 +10,7 @@ groups=(bakaclub) ...@@ -10,7 +10,7 @@ groups=(bakaclub)
depends=('sqlite3>=3.31.0' curl json-c mpv sdl2) depends=('sqlite3>=3.31.0' curl json-c mpv sdl2)
makedepends=(git bash 'gcc>=8.1') makedepends=(git bash 'gcc>=8.1')
provides=(lektor) provides=(lektor)
changelog=CHANGELOG changelog=CHANGELOG.md
source=() source=()
function pkgver () function pkgver ()
......
...@@ -446,7 +446,7 @@ module_sdl2_close(struct module_sdl2_window *win) ...@@ -446,7 +446,7 @@ module_sdl2_close(struct module_sdl2_window *win)
RETURN_UNLESS(win->mpv, "Missing mpv ctx", NOTHING); RETURN_UNLESS(win->mpv, "Missing mpv ctx", NOTHING);
static const char *cmd[] = { "stop", NULL }; static const char *cmd[] = { "stop", NULL };
mpv_command_async((mpv_handle *) win->mpv, 0, cmd); mpv_command_async((mpv_handle *) win->mpv, 0, cmd);
LOG_INFO("SDL2", "Module closed"); LOG_INFO("WINDOW", "Module closed");
/* TODO: make the SDL window background be black. */ /* TODO: make the SDL window background be black. */
} }
...@@ -455,12 +455,12 @@ module_sdl2_free(struct module_sdl2_window *win) ...@@ -455,12 +455,12 @@ module_sdl2_free(struct module_sdl2_window *win)
{ {
RETURN_UNLESS(win, "Invalid arguments", NOTHING); RETURN_UNLESS(win, "Invalid arguments", NOTHING);
module_sdl2_close(win); module_sdl2_close(win);
LOG_INFO("SDL2", "Waiting for window thread"); LOG_INFO("WINDOW", "Waiting for window thread");
win->launched = 2; win->launched = 2;
while (win->launched) while (win->launched)
sched_yield(); sched_yield();
poller_join(&win->self, NULL); poller_join(&win->self, NULL);
LOG_INFO("SDL2", "Module terminated"); LOG_INFO("WINDOW", "Module terminated");
} }
static bool static bool
...@@ -478,7 +478,7 @@ module_sdl2_load_file(struct module_sdl2_window *win, const char *filepath) ...@@ -478,7 +478,7 @@ module_sdl2_load_file(struct module_sdl2_window *win, const char *filepath)
win->mpv_duration = 0; win->mpv_duration = 0;
win->mpv_time_pos = 0; win->mpv_time_pos = 0;
win->hinib = true; win->hinib = true;
LOG_DEBUG("SDL2", "Hinib flag at %d", win->hinib); LOG_DEBUG("WINDOW", "Hinib flag at %d", win->hinib);
return ret; return ret;
} }
......
...@@ -120,10 +120,10 @@ static void ...@@ -120,10 +120,10 @@ static void
send_status(struct lkt_state *srv, size_t c, int status, const char *cmd_name) send_status(struct lkt_state *srv, size_t c, int status, const char *cmd_name)
{ {
if (!status) { if (!status) {
LOG_INFO("COMMAND", "Command '%s'", cmd_name); LOG_DEBUG("COMMAND", "Command '%s'", cmd_name);
send_ok(srv, c); send_ok(srv, c);
} else { } else {
LOG_INFO("COMMAND", "Command '%s' %s", cmd_name, LOG_DEBUG("COMMAND", "Command '%s' %s", cmd_name,
status == 2 ? "is unknown" : "has failed"); status == 2 ? "is unknown" : "has failed");
send_ack(srv, c, cmd_name); send_ack(srv, c, cmd_name);
} }
...@@ -296,7 +296,7 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd) ...@@ -296,7 +296,7 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
continuation = lkt_get_continuation(srv, c); continuation = lkt_get_continuation(srv, c);
if (continuation > 0) { if (continuation > 0) {
LOG_INFO("NETWORK", "Client should continue from '%d'", LOG_DEBUG("NETWORK", "Client should continue from '%d'",
continuation); continuation);
send_continue(srv, c, continuation); send_continue(srv, c, continuation);
} }
...@@ -345,7 +345,7 @@ handle_command(struct lkt_state *srv, size_t i, struct lkt_command cmd) ...@@ -345,7 +345,7 @@ handle_command(struct lkt_state *srv, size_t i, struct lkt_command cmd)
else else
err = handle_simple_command(srv, i, cmd); err = handle_simple_command(srv, i, cmd);
LOG_INFO("COMMAND", "Command result '%s' -> %d", cmd.name, err); LOG_DEBUG("COMMAND", "Command result '%s' -> %d", cmd.name, err);
return err; return err;
} }
...@@ -488,8 +488,7 @@ init_listening_socket(const char *host, const char *port) ...@@ -488,8 +488,7 @@ init_listening_socket(const char *host, const char *port)
freeaddrinfo(available); freeaddrinfo(available);
if (fd < 0) { if (fd < 0) {
LOG_ERROR("NETWORK", "Failed to bind to %s:%s", LOG_ERROR("NETWORK", "Failed to bind to %s:%s", host ? host : "0.0.0.0", port);
host ? host : "0.0.0.0", port);
return -1; return -1;
} }
...@@ -522,8 +521,7 @@ accept_all(int listen_fd, struct pollfd *fds, size_t fds_max, size_t *fds_len) ...@@ -522,8 +521,7 @@ accept_all(int listen_fd, struct pollfd *fds, size_t fds_max, size_t *fds_len)
} }
if (*fds_len == fds_max) { if (*fds_len == fds_max) {
LOG_ERROR("NETWORK", "Maximum number '%ld' of file descriptors" LOG_ERROR("NETWORK", "Maximum number '%ld' of file descriptors reached", fds_max);
" reached", fds_max);
break; break;
} }
...@@ -539,7 +537,7 @@ accept_all(int listen_fd, struct pollfd *fds, size_t fds_max, size_t *fds_len) ...@@ -539,7 +537,7 @@ accept_all(int listen_fd, struct pollfd *fds, size_t fds_max, size_t *fds_len)
char *host = inet_ntoa(peer_addr.sin_addr); char *host = inet_ntoa(peer_addr.sin_addr);
uint16_t port = htons(peer_addr.sin_port); uint16_t port = htons(peer_addr.sin_port);
LOG_WARN("NETWORK", "New connection from %s:%d", host, port); LOG_INFO("NETWORK", "New connection from %s:%d", host, port);
fds->fd = fd; fds->fd = fd;
fds->events = POLLIN; fds->events = POLLIN;
...@@ -678,8 +676,7 @@ handle_idle_events(struct lkt_state *srv) ...@@ -678,8 +676,7 @@ handle_idle_events(struct lkt_state *srv)
strncat(msg->data, "message ", LKT_MESSAGE_MAX - 1); strncat(msg->data, "message ", LKT_MESSAGE_MAX - 1);
msg->data_len = strlen(msg->data); msg->data_len = strlen(msg->data);
LOG_INFO("COMMAND", "Sending '%s' (len: %ld) to client %ld", LOG_DEBUG("COMMAND", "Sending '%s' (len: %ld) to client %ld", msg->data, msg->data_len, i);
msg->data, msg->data_len, i);
msg->data[msg->data_len - 1] = '\n'; msg->data[msg->data_len - 1] = '\n';
msg->data[msg->data_len] = '\0'; msg->data[msg->data_len] = '\0';
lkt_state_send(srv, i, msg); lkt_state_send(srv, i, msg);
...@@ -827,13 +824,13 @@ __signal_handler(int sig) ...@@ -827,13 +824,13 @@ __signal_handler(int sig)
static void static void
__lkt_handle_INT(struct lkt_state *srv) __lkt_handle_INT(struct lkt_state *srv)
{ {
LOG_INFO("GENERAL", "Stopping lektord"); LOG_INFO("SIGNAL", "Stopping lektord");
MOD_PROC(srv->repo_mod, "free"); MOD_PROC(srv->repo_mod, "free");
MOD_PROC(srv->window_mod, "free"); MOD_PROC(srv->window_mod, "free");
close(srv->fds[0].fd); close(srv->fds[0].fd);
lkt_queue_free(&srv->queue); lkt_queue_free(&srv->queue);
database_close_all(); database_close_all();
LOG_INFO("GENERAL", "lektord will now exit"); LOG_INFO("SIGNAL", "lektord will now exit");
/* Register default handle for SIGINT, so if you double ctrl+c it exit like /* Register default handle for SIGINT, so if you double ctrl+c it exit like
* it crashed. */ * it crashed. */
...@@ -901,7 +898,7 @@ lkt_listen(struct lkt_state *srv) ...@@ -901,7 +898,7 @@ lkt_listen(struct lkt_state *srv)
srv->clients = calloc(srv->fds_max, sizeof(struct lkt_client)); srv->clients = calloc(srv->fds_max, sizeof(struct lkt_client));
memset(srv->clients, 0, srv->fds_max * sizeof(struct lkt_client)); memset(srv->clients, 0, srv->fds_max * sizeof(struct lkt_client));
LOG_INFO("SIGNAL", "Register signal handlers for signals..."); LOG_INFO("INIT", "Register signal handlers for signals...");
srv->__signal_INT = __lkt_handle_INT; srv->__signal_INT = __lkt_handle_INT;
srv->__signal_QUIT = __lkt_handle_INT; srv->__signal_QUIT = __lkt_handle_INT;
srv->__signal_USR1 = __lkt_handle_USR1; srv->__signal_USR1 = __lkt_handle_USR1;
...@@ -912,7 +909,7 @@ lkt_listen(struct lkt_state *srv) ...@@ -912,7 +909,7 @@ lkt_listen(struct lkt_state *srv)
signal(SIGUSR1, __signal_handler); signal(SIGUSR1, __signal_handler);
signal(SIGUSR2, __signal_handler); signal(SIGUSR2, __signal_handler);
signal(SIGQUIT, __signal_handler); signal(SIGQUIT, __signal_handler);
LOG_INFO("SIGNAL", "Signal handlers registered"); LOG_INFO("INIT", "Signal handlers registered");
if ((srv->fds[0].fd = init_listening_socket(srv->host, srv->port)) < 0) if ((srv->fds[0].fd = init_listening_socket(srv->host, srv->port)) < 0)
return; return;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter