emgauwa/controller-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: better logging behaviour

Browse source
This commit is contained in:
Tobias Reisinger 2020-07-26 21:05:41 +02:00
parent 011c5a6102
commit 0530a350df
30 changed files with 343 additions and 176 deletions

12
src/models/controller.c
View file

@ -55,16 +55,16 @@ controller_debug(controller_t *controller)
{
if(controller == NULL)
{
LOG_DEBUG("controller is NULL\n");
LOGGER_DEBUG("controller is NULL\n");
return;
}
char uuid_str[37];
uuid_unparse(controller->id, uuid_str);
LOG_DEBUG("(1/5) %s @ %p\n", uuid_str, (void*)controller);
LOG_DEBUG("(2/5) name: %s\n", controller->name);
LOG_DEBUG("(3/5) command_port: %5d discovery_port: %5d\n", controller->command_port, controller->discovery_port);
LOG_DEBUG("(4/5) relay count: %3d\n", controller->relay_count);
LOG_DEBUG("(5/5) relays @ %p:\n", (void*)controller->relays);
LOGGER_DEBUG("(1/5) %s @ %p\n", uuid_str, (void*)controller);
LOGGER_DEBUG("(2/5) name: %s\n", controller->name);
LOGGER_DEBUG("(3/5) command_port: %5d discovery_port: %5d\n", controller->command_port, controller->discovery_port);
LOGGER_DEBUG("(4/5) relay count: %3d\n", controller->relay_count);
LOGGER_DEBUG("(5/5) relays @ %p:\n", (void*)controller->relays);
for(int i = 0; i < controller->relay_count; ++i)
{
relay_debug(controller->relays[i]);

9
src/models/controller_load.c
View file

@ -18,7 +18,7 @@ controller_load_single(MDB_txn *mdb_txn, MDB_dbi mdb_dbi, db_key_controller_e ke
if((err = mdb_get(mdb_txn, mdb_dbi, &key, value)) != 0)
{
LOG_ERROR("mdb_get error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_get error %s\n", mdb_strerror(err));
exit(1);
}
}
@ -34,7 +34,7 @@ controller_load(MDB_env *mdb_env)
if((err = mdb_txn_begin(mdb_env, NULL, MDB_RDONLY, &mdb_txn)) != 0)
{
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_txn_begin error %s\n", mdb_strerror(err));
return NULL;
}
if((err = mdb_dbi_open(mdb_txn, "controller", 0, &mdb_dbi)) != 0)
@ -42,13 +42,13 @@ controller_load(MDB_env *mdb_env)
switch(err)
{
case MDB_NOTFOUND:
LOG_INFO("no controller found in db. creating new one\n");
LOGGER_INFO("no controller found in db. creating new one\n");
mdb_txn_abort(mdb_txn);
new_controller = controller_create();
controller_save(new_controller, mdb_env);
return new_controller;
default:
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_txn_begin error %s\n", mdb_strerror(err));
return NULL;
}
}
@ -77,7 +77,6 @@ controller_load(MDB_env *mdb_env)
new_controller->relays = malloc(sizeof(relay_t*) * new_controller->relay_count);
for(uint8_t i = 0; i < new_controller->relay_count; i++)
{
LOG_TRACE("loading relay %d\n", i);
new_controller->relays[i] = relay_load(mdb_env, i);
}

15
src/models/controller_save.c
View file

@ -18,7 +18,7 @@ controller_save_single(MDB_txn *mdb_txn, MDB_dbi mdb_dbi, db_key_controller_e ke
if((err = mdb_put(mdb_txn, mdb_dbi, &key, &value, 0)) != 0)
{
LOG_ERROR("mdb_put error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_put error %s\n", mdb_strerror(err));
mdb_txn_abort(mdb_txn);
return 1;
}
@ -36,13 +36,13 @@ controller_save(controller_t *controller, MDB_env *mdb_env)
if((err = mdb_txn_begin(mdb_env, NULL, 0, &mdb_txn)) != 0)
{
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_txn_begin error %s\n", mdb_strerror(err));
exit(1);
}
if((err = mdb_dbi_open(mdb_txn, "controller", MDB_CREATE, &mdb_dbi)) != 0)
{
LOG_ERROR("mdb_dbi_open error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_dbi_open error %s\n", mdb_strerror(err));
exit(1);
}
@ -50,7 +50,7 @@ controller_save(controller_t *controller, MDB_env *mdb_env)
value.mv_data = controller->id;
if(controller_save_single(mdb_txn, mdb_dbi, DB_KEY_CONTROLLER_ID, value))
{
LOG_ERROR("failed to save ID\n");
LOGGER_ERR("failed to save ID\n");
return 1;
}
@ -58,7 +58,7 @@ controller_save(controller_t *controller, MDB_env *mdb_env)
value.mv_data = controller->name;
if(controller_save_single(mdb_txn, mdb_dbi, DB_KEY_CONTROLLER_NAME, value))
{
LOG_ERROR("failed to save name\n");
LOGGER_ERR("failed to save name\n");
return 1;
}
@ -66,7 +66,7 @@ controller_save(controller_t *controller, MDB_env *mdb_env)
value.mv_data = &controller->command_port;
if(controller_save_single(mdb_txn, mdb_dbi, DB_KEY_CONTROLLER_COMMAND_PORT, value))
{
LOG_ERROR("failed to save command port\n");
LOGGER_ERR("failed to save command port\n");
return 1;
}
@ -74,7 +74,7 @@ controller_save(controller_t *controller, MDB_env *mdb_env)
value.mv_data = &controller->discovery_port;
if(controller_save_single(mdb_txn, mdb_dbi, DB_KEY_CONTROLLER_DISCOVERY_PORT, value))
{
LOG_ERROR("failed to save discovery port\n");
LOGGER_ERR("failed to save discovery port\n");
return 1;
}
@ -82,7 +82,6 @@ controller_save(controller_t *controller, MDB_env *mdb_env)
for(uint8_t i = 0; i < controller->relay_count; ++i)
{
LOG_TRACE("saving relays[%d/%d]\n", i, controller->relay_count);
relay_save(controller->relays[i], mdb_env);
}

8
src/models/relay.c
View file

@ -62,12 +62,12 @@ relay_debug(relay_t *relay)
{
if(relay == NULL)
{
LOG_DEBUG("relay is NULL\n");
LOGGER_DEBUG("relay is NULL\n");
return;
}
LOG_DEBUG("(1/3) %d @ %p\n", relay->number, (void*)relay);
LOG_DEBUG("(2/3) name: %s\n", relay->name);
LOG_DEBUG("(3/3) schedules @ %p:\n", (void*)relay->schedules);
LOGGER_DEBUG("(1/3) %d @ %p\n", relay->number, (void*)relay);
LOGGER_DEBUG("(2/3) name: %s\n", relay->name);
LOGGER_DEBUG("(3/3) schedules @ %p:\n", (void*)relay->schedules);
for(int i = 0; i < 7; ++i)
{
schedule_debug(relay->schedules[i]);

10
src/models/relay_load.c
View file

@ -25,7 +25,7 @@ relay_load_single(MDB_txn *mdb_txn, MDB_dbi mdb_dbi, db_key_relay_e key_relay, u
if((err = mdb_get(mdb_txn, mdb_dbi, &key, value)) != 0)
{
LOG_ERROR("mdb_get error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_get error %s\n", mdb_strerror(err));
mdb_txn_abort(mdb_txn);
free(key_data);
return 1;
@ -45,7 +45,7 @@ relay_load(MDB_env *mdb_env, uint8_t num)
if((err = mdb_txn_begin(mdb_env, NULL, MDB_RDONLY, &mdb_txn)) != 0)
{
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_txn_begin error %s\n", mdb_strerror(err));
return relay_create(num);
}
@ -54,11 +54,11 @@ relay_load(MDB_env *mdb_env, uint8_t num)
switch(err)
{
case MDB_NOTFOUND:
LOG_INFO("no relay for num %d found in db. returning new one (no relays db)\n", num);
LOGGER_INFO("no relay for num %d found in db. returning new one (no relays db)\n", num);
mdb_txn_abort(mdb_txn);
return relay_create(num);
default:
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_txn_begin error %s\n", mdb_strerror(err));
return relay_create(num);
}
}
@ -75,7 +75,7 @@ relay_load(MDB_env *mdb_env, uint8_t num)
if((err = relay_load_single(mdb_txn, mdb_dbi, DB_KEY_RELAY_NAME, num, &value)) != 0)
{
LOG_INFO("no relay for num %d found in db. returning new one\n", num);
LOGGER_INFO("no relay for num %d found in db. returning new one\n", num);
mdb_txn_abort(mdb_txn); // transaction is read only
return relay_create(num);
}

9
src/models/relay_save.c
View file

@ -25,7 +25,7 @@ relay_save_single(MDB_txn *mdb_txn, MDB_dbi mdb_dbi, db_key_relay_e key_relay, u
if((err = mdb_put(mdb_txn, mdb_dbi, &key, &value, 0)) != 0)
{
LOG_ERROR("mdb_put error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_put error %s\n", mdb_strerror(err));
mdb_txn_abort(mdb_txn);
free(key_data);
return 1;
@ -37,7 +37,6 @@ relay_save_single(MDB_txn *mdb_txn, MDB_dbi mdb_dbi, db_key_relay_e key_relay, u
int
relay_save(relay_t *relay, MDB_env *mdb_env)
{
LOG_TRACE("saving relay %d @ %p\n", relay->number, relay);
int err;
MDB_txn *mdb_txn;
@ -46,13 +45,13 @@ relay_save(relay_t *relay, MDB_env *mdb_env)
if((err = mdb_txn_begin(mdb_env, NULL, 0, &mdb_txn)) != 0)
{
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_txn_begin error %s\n", mdb_strerror(err));
exit(1);
}
if((err = mdb_dbi_open(mdb_txn, "relays", MDB_CREATE, &mdb_dbi)) != 0)
{
LOG_ERROR("mdb_dbi_open error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_dbi_open error %s\n", mdb_strerror(err));
exit(1);
}
@ -60,7 +59,7 @@ relay_save(relay_t *relay, MDB_env *mdb_env)
value.mv_data = relay->name;
if(relay_save_single(mdb_txn, mdb_dbi, DB_KEY_RELAY_NAME, relay->number, value))
{
LOG_ERROR("failed to save name\n");
LOGGER_ERR("failed to save name\n");
return 1;
}

10
src/models/schedule.c
View file

@ -63,14 +63,14 @@ schedule_debug(schedule_t *schedule)
{
if(schedule == NULL)
{
LOG_DEBUG("schedule is NULL\n");
LOGGER_DEBUG("schedule is NULL\n");
return;
}
char uuid_str[UUID_STR_LEN];
uuid_unparse(schedule->id, uuid_str);
LOG_DEBUG("(1/3) %s @ %p\n", uuid_str, (void*)schedule);
LOG_DEBUG("(2/4) period count: %3d\n", schedule->length);
LOG_DEBUG("(3/4) weekday: %3d\n", schedule->weekday);
LOGGER_DEBUG("(1/3) %s @ %p\n", uuid_str, (void*)schedule);
LOGGER_DEBUG("(2/4) period count: %3d\n", schedule->length);
LOGGER_DEBUG("(3/4) weekday: %3d\n", schedule->weekday);
// one block: "HH:MM-HH:MM, " --> size: 13 (14 with '\0')
char *periods_debug_str = malloc(sizeof(char) * ((schedule->length * 13) + 1));
@ -88,7 +88,7 @@ schedule_debug(schedule_t *schedule)
);
}
LOG_DEBUG("(4/4) periods: %s\n", periods_debug_str);
LOGGER_DEBUG("(4/4) periods: %s\n", periods_debug_str);
free(periods_debug_str);
}

12
src/models/schedule_load.c
View file

@ -27,7 +27,7 @@ schedule_load_single(MDB_txn *mdb_txn, MDB_dbi mdb_dbi, db_key_schedule_e key_sc
if((err = mdb_get(mdb_txn, mdb_dbi, &key, value)) != 0)
{
LOG_ERROR("mdb_get error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_get error %s\n", mdb_strerror(err));
mdb_txn_abort(mdb_txn);
free(key_data);
return 1;
@ -51,7 +51,7 @@ schedule_load(MDB_env *mdb_env, uint8_t relay_num, uint8_t weekday)
if((err = mdb_txn_begin(mdb_env, NULL, MDB_RDONLY, &mdb_txn)) != 0)
{
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_txn_begin error %s\n", mdb_strerror(err));
return schedule_create(off_id, weekday, 0, NULL);
}
@ -60,11 +60,11 @@ schedule_load(MDB_env *mdb_env, uint8_t relay_num, uint8_t weekday)
switch(err)
{
case MDB_NOTFOUND:
LOG_INFO("no schedule db found in db. returning new one (no schedules db)\n");
LOGGER_INFO("no schedule db found in db. returning new one (no schedules db)\n");
mdb_txn_abort(mdb_txn);
break;
default:
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_txn_begin error %s\n", mdb_strerror(err));
}
return schedule_create(off_id, weekday, 0, NULL);
}
@ -73,7 +73,7 @@ schedule_load(MDB_env *mdb_env, uint8_t relay_num, uint8_t weekday)
if((err = schedule_load_single(mdb_txn, mdb_dbi, DB_KEY_SCHEDULE_ID, relay_num, weekday, &value)) != 0)
{
LOG_INFO("no schedule for relay %d and weekday %d found in db. returning new one\n", relay_num, weekday);
LOGGER_INFO("no schedule for relay %d and weekday %d found in db. returning new one\n", relay_num, weekday);
mdb_txn_abort(mdb_txn); // transaction is read only
return schedule_create(off_id, weekday, 0, NULL);
}
@ -81,7 +81,7 @@ schedule_load(MDB_env *mdb_env, uint8_t relay_num, uint8_t weekday)
if((err = schedule_load_single(mdb_txn, mdb_dbi, DB_KEY_SCHEDULE_PERIODS, relay_num, weekday, &value)) != 0)
{
LOG_INFO("no schedule for relay %d and weekday %d found in db. returning new one\n", relay_num, weekday);
LOGGER_INFO("no schedule for relay %d and weekday %d found in db. returning new one\n", relay_num, weekday);
mdb_txn_abort(mdb_txn); // transaction is read only
return schedule_create(off_id, weekday, 0, NULL);
}

11
src/models/schedule_save.c
View file

@ -28,7 +28,7 @@ schedule_save_single(MDB_txn *mdb_txn, MDB_dbi mdb_dbi, db_key_schedule_e key_sc
if((err = mdb_put(mdb_txn, mdb_dbi, &key, &value, 0)) != 0)
{
LOG_ERROR("mdb_put error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_put error %s\n", mdb_strerror(err));
mdb_txn_abort(mdb_txn);
free(key_data);
return 1;
@ -42,7 +42,6 @@ schedule_save(schedule_t *schedule, uint8_t relay_num, MDB_env *mdb_env)
{
char uuid_str[37];
uuid_unparse(schedule->id, uuid_str);
LOG_TRACE("saving schedule %s @ %p\n", uuid_str, schedule);
int err;
MDB_txn *mdb_txn;
@ -51,13 +50,13 @@ schedule_save(schedule_t *schedule, uint8_t relay_num, MDB_env *mdb_env)
if((err = mdb_txn_begin(mdb_env, NULL, 0, &mdb_txn)) != 0)
{
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_txn_begin error %s\n", mdb_strerror(err));
exit(1);
}
if((err = mdb_dbi_open(mdb_txn, "schedules", MDB_CREATE, &mdb_dbi)) != 0)
{
LOG_ERROR("mdb_dbi_open error %s\n", mdb_strerror(err));
LOGGER_ERR("mdb_dbi_open error %s\n", mdb_strerror(err));
exit(1);
}
@ -65,7 +64,7 @@ schedule_save(schedule_t *schedule, uint8_t relay_num, MDB_env *mdb_env)
value.mv_data = schedule->id;
if(schedule_save_single(mdb_txn, mdb_dbi, DB_KEY_SCHEDULE_ID, relay_num, schedule->weekday, value))
{
LOG_ERROR("failed to save ID\n");
LOGGER_ERR("failed to save ID\n");
return 1;
}
@ -76,7 +75,7 @@ schedule_save(schedule_t *schedule, uint8_t relay_num, MDB_env *mdb_env)
if(schedule_save_single(mdb_txn, mdb_dbi, DB_KEY_SCHEDULE_PERIODS, relay_num, schedule->weekday, value))
{
free(periods_blob);
LOG_ERROR("failed to save periods\n");
LOGGER_ERR("failed to save periods\n");
return 1;
}
free(periods_blob);