fix: logger
This commit is contained in:
parent
61e025343d
commit
db3bcaf7d1
28 changed files with 200 additions and 180 deletions
handlers
|
@ -64,7 +64,7 @@ handler_command(int fd, controller_t *controller)
|
|||
|
||||
if((client_fd = accept(fd, (struct sockaddr *) &their_addr, &addr_size)) < 0)
|
||||
{
|
||||
LOG_ERROR("could not accept client: %s", strerror(errno));
|
||||
LOG_ERROR("could not accept client: %s\n", strerror(errno));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -72,7 +72,7 @@ handler_command(int fd, controller_t *controller)
|
|||
|
||||
if(recv(client_fd, &payload_length, sizeof(payload_length), 0) <= 0)
|
||||
{
|
||||
LOG_ERROR("unable to receive header: %s", strerror(errno));
|
||||
LOG_ERROR("unable to receive header: %s\n", strerror(errno));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -81,7 +81,7 @@ handler_command(int fd, controller_t *controller)
|
|||
|
||||
if((bytes_transferred = recv(client_fd, payload, payload_length, 0)) <= 0)
|
||||
{
|
||||
LOG_ERROR("unable to receive payload: %s", strerror(errno));
|
||||
LOG_ERROR("unable to receive payload: %s\n", strerror(errno));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -92,7 +92,7 @@ handler_command(int fd, controller_t *controller)
|
|||
|
||||
uint8_t command_code = mpack_node_u8(mpack_node_map_uint(root, COMMAND_MAPPING_CODE));
|
||||
|
||||
LOG_INFO("received command %d", command_code);
|
||||
LOG_INFO("received command %d\n", command_code);
|
||||
|
||||
switch(command_code)
|
||||
{
|
||||
|
@ -116,12 +116,12 @@ handler_command(int fd, controller_t *controller)
|
|||
case COMMAND_CODE_GET_RELAY_NAME:
|
||||
break;
|
||||
default:
|
||||
LOG_ERROR("received invalid command");
|
||||
LOG_ERROR("received invalid command\n");
|
||||
}
|
||||
|
||||
if(mpack_tree_destroy(&tree) != mpack_ok)
|
||||
{
|
||||
LOG_WARN("error when destroying mpack tree");
|
||||
LOG_WARN("error when destroying mpack tree\n");
|
||||
}
|
||||
free(payload);
|
||||
close(client_fd);
|
||||
|
|
|
@ -26,14 +26,14 @@ handler_discovery(int fd, controller_t *controller)
|
|||
|
||||
if((bytes_transferred = recvfrom(fd, &discovery_answer_port, sizeof(discovery_answer_port), 0, (struct sockaddr *) &si_other, &slen)) <= 0)
|
||||
{
|
||||
LOG_ERROR("received invalid discovery from %s", inet_ntoa(si_other.sin_addr));
|
||||
LOG_ERROR("received invalid discovery from %s\n", inet_ntoa(si_other.sin_addr));
|
||||
return;
|
||||
}
|
||||
LOG_INFO("received discovery from %s:%d", inet_ntoa(si_other.sin_addr), discovery_answer_port);
|
||||
LOG_INFO("received discovery from %s:%d\n", inet_ntoa(si_other.sin_addr), discovery_answer_port);
|
||||
|
||||
if(discovery_answer_port == 0)
|
||||
{
|
||||
LOG_ERROR("invalid port received");
|
||||
LOG_ERROR("invalid port received\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -56,7 +56,7 @@ handler_discovery(int fd, controller_t *controller)
|
|||
// finish writing
|
||||
if(mpack_writer_destroy(&writer) != mpack_ok)
|
||||
{
|
||||
LOG_ERROR("error writing discovery answer payload");
|
||||
LOG_ERROR("error writing discovery answer payload\n");
|
||||
return;
|
||||
|
||||
}
|
||||
|
@ -64,21 +64,21 @@ handler_discovery(int fd, controller_t *controller)
|
|||
int fd_answer = helper_connect_tcp_server(inet_ntoa(si_other.sin_addr), discovery_answer_port);
|
||||
if(fd_answer == -1)
|
||||
{
|
||||
LOG_ERROR("error during connecting");
|
||||
LOG_ERROR("error during connecting\n");
|
||||
free(payload);
|
||||
return;
|
||||
}
|
||||
|
||||
if((bytes_transferred = send(fd_answer, &payload_size, sizeof(payload_size), 0)) <= 0)
|
||||
{
|
||||
LOG_ERROR("error during sending");
|
||||
LOG_ERROR("error during sending\n");
|
||||
free(payload);
|
||||
close(fd_answer);
|
||||
return;
|
||||
}
|
||||
if((bytes_transferred = send(fd_answer, payload, payload_size, 0)) <= 0)
|
||||
{
|
||||
LOG_ERROR("error during sending");
|
||||
LOG_ERROR("error during sending\n");
|
||||
free(payload);
|
||||
close(fd_answer);
|
||||
return;
|
||||
|
|
|
@ -15,14 +15,14 @@
|
|||
void
|
||||
handler_loop(controller_t *controller)
|
||||
{
|
||||
LOG_DEBUG("===== IDLE LOOP START =====");
|
||||
LOG_DEBUG("===== IDLE LOOP START =====\n");
|
||||
for(uint_fast8_t i = 0; i < controller->relay_count; ++i)
|
||||
{
|
||||
relay_t *relay = controller->relays[i];
|
||||
int is_active = 0;
|
||||
if(relay_is_active(relay, time(NULL)))
|
||||
{
|
||||
LOG_DEBUG("relay %d is active", i);
|
||||
LOG_DEBUG("relay %d is active\n", i);
|
||||
is_active = 1;
|
||||
}
|
||||
if(global_config.relay_configs[i].inverted)
|
||||
|
@ -38,7 +38,7 @@ handler_loop(controller_t *controller)
|
|||
driver_piface_set(global_config.relay_configs[i].pin, is_active);
|
||||
break;
|
||||
default:
|
||||
LOG_WARN("relay %d is not using a driver", i);
|
||||
LOG_WARN("relay %d is not using a driver\n", i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ handler_poll(struct pollfd *fds, controller_t *controller, MDB_env *mdb_env)
|
|||
if(fds[i].revents & POLLIN)
|
||||
{
|
||||
/* data may be read on device number i. */
|
||||
LOG_DEBUG("fd %i may read data", fds[i].fd);
|
||||
LOG_DEBUG("fd %i may read data\n", fds[i].fd);
|
||||
switch(i)
|
||||
{
|
||||
case POLL_FDS_DISCOVERY:
|
||||
|
@ -44,7 +44,7 @@ handler_poll(struct pollfd *fds, controller_t *controller, MDB_env *mdb_env)
|
|||
if(fds[i].revents & POLLHUP)
|
||||
{
|
||||
/* A hangup has occurred on device number i. */
|
||||
LOG_DEBUG("fd %i got closed", fds[i].fd);
|
||||
LOG_DEBUG("fd %i got closed\n", fds[i].fd);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue