fix: better logging behaviour

This commit is contained in:
Tobias Reisinger 2020-07-26 21:00:05 +02:00
parent 3e6d0333b7
commit 398019afe8
36 changed files with 256 additions and 188 deletions

View file

@ -15,7 +15,7 @@ command_set_relay_schedule(relay_t *relay)
controller_t *controller = controller_get_by_id(relay->controller_id);
if(!controller)
{
LOG_ERROR("couldn't find controller\n");
LOGGER_ERR("couldn't find controller\n");
return 1;
}
@ -66,7 +66,7 @@ command_set_relay_schedule(relay_t *relay)
// finish writing
if (mpack_writer_destroy(&writer) != mpack_ok)
{
LOG_ERROR("an error occurred encoding the data");
LOGGER_ERR("an error occurred encoding the data");
controller_free(controller);
return 1;
}
@ -100,7 +100,7 @@ command_set_controller_name(controller_t *controller)
// finish writing
if (mpack_writer_destroy(&writer) != mpack_ok)
{
LOG_ERROR("an error occurred encoding the data");
LOGGER_ERR("an error occurred encoding the data");
return 1;
}
@ -113,7 +113,7 @@ command_set_controller_name(controller_t *controller)
int
command_send(controller_t *controller, int command_code, char *payload, uint32_t payload_size)
{
LOG_DEBUG("commanding %d\n", command_code);
LOGGER_DEBUG("commanding %d\n", command_code);
int bytes_transferred;
@ -121,18 +121,18 @@ command_send(controller_t *controller, int command_code, char *payload, uint32_t
if(fd_controller == -1)
{
LOG_ERROR("can't open command socket %s:%d\n", controller->ip, controller->port);
LOGGER_ERR("can't open command socket %s:%d\n", controller->ip, controller->port);
return 1;
}
if((bytes_transferred = send(fd_controller, &payload_size, sizeof(payload_size), 0)) <= 0)
{
LOG_ERROR("error during sending size\n");
LOGGER_ERR("error during sending size\n");
return 1;
}
if((bytes_transferred = send(fd_controller, payload, payload_size, 0)) <= 0)
{
LOG_ERROR("error during sending\n");
LOGGER_ERR("error during sending\n");
return 1;
}
@ -146,7 +146,7 @@ command_pulse(relay_t *relay, uint8_t duration)
controller_t *controller = controller_get_by_id(relay->controller_id);
if(!controller)
{
LOG_ERROR("couldn't find controller\n");
LOGGER_ERR("couldn't find controller\n");
return 1;
}
@ -172,7 +172,7 @@ command_pulse(relay_t *relay, uint8_t duration)
// finish writing
if (mpack_writer_destroy(&writer) != mpack_ok)
{
LOG_ERROR("an error occurred encoding the data");
LOGGER_ERR("an error occurred encoding the data");
controller_free(controller);
return 1;
}