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

fix: logger

Browse source
This commit is contained in:
Tobias Reisinger 2020-04-24 15:08:26 +02:00
parent 61e025343d
commit db3bcaf7d1
28 changed files with 200 additions and 180 deletions

12
models/controller.c
View file

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

10
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", mdb_strerror(err));
LOG_ERROR("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", mdb_strerror(err));
LOG_ERROR("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");
LOG_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", mdb_strerror(err));
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
return NULL;
}
}
@ -77,7 +77,7 @@ 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", i);
LOG_TRACE("loading relay %d\n", i);
new_controller->relays[i] = relay_load(mdb_env, i);
}

16
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", mdb_strerror(err));
LOG_ERROR("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", mdb_strerror(err));
LOG_ERROR("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", mdb_strerror(err));
LOG_ERROR("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");
LOG_ERROR("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");
LOG_ERROR("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");
LOG_ERROR("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");
LOG_ERROR("failed to save discovery port\n");
return 1;
}
@ -82,7 +82,7 @@ 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]", i, controller->relay_count);
LOG_TRACE("saving relays[%d/%d]\n", i, controller->relay_count);
relay_save(controller->relays[i], mdb_env);
}

13
models/relay.c
View file

@ -51,23 +51,18 @@ relay_is_active(relay_t *relay, time_t timestamp_now)
}
return 0;
}
//struct tm time_start, time_now, time_end;
//localtime_r(&timestamp_start, &time_start);
//localtime_r(&timestamp_now, &time_now);
//localtime_r(&timestamp_end, &time_end);
//LOG_DEBUG("%02d:%02d - %02d:%02d - %02d:%02d", time_start.tm_hour, time_start.tm_min, time_now.tm_hour, time_now.tm_min, time_end.tm_hour, time_end.tm_min);
void
relay_debug(relay_t *relay)
{
if(relay == NULL)
{
LOG_DEBUG("relay is NULL");
LOG_DEBUG("relay is NULL\n");
return;
}
LOG_DEBUG("(1/3) %d @ %p", relay->number, (void*)relay);
LOG_DEBUG("(2/3) name: %s", relay->name);
LOG_DEBUG("(3/3) schedule:");
LOG_DEBUG("(1/3) %d @ %p\n", relay->number, (void*)relay);
LOG_DEBUG("(2/3) name: %s\n", relay->name);
LOG_DEBUG("(3/3) schedule:\n");
schedule_debug(relay->schedule);
}

14
models/relay_load.c
View file

@ -23,7 +23,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", mdb_strerror(err));
LOG_ERROR("mdb_get error %s\n", mdb_strerror(err));
mdb_txn_abort(mdb_txn);
free(key_data);
return 1;
@ -43,7 +43,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", mdb_strerror(err));
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
return relay_create(num);
}
@ -52,11 +52,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)", num);
LOG_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", mdb_strerror(err));
LOG_ERROR("mdb_txn_begin error %s\n", mdb_strerror(err));
return relay_create(num);
}
}
@ -68,7 +68,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", num);
LOG_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);
}
@ -77,7 +77,7 @@ relay_load(MDB_env *mdb_env, uint8_t num)
if((err = relay_load_single(mdb_txn, mdb_dbi, DB_KEY_RELAY_SCHEDULE_ID, num, &value)) != 0)
{
LOG_INFO("no relay for num %d found in db. returning new one", num);
LOG_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);
}
@ -85,7 +85,7 @@ relay_load(MDB_env *mdb_env, uint8_t num)
if((err = relay_load_single(mdb_txn, mdb_dbi, DB_KEY_RELAY_SCHEDULE_PERIODS, num, &value)) != 0)
{
LOG_INFO("no relay for num %d found in db. returning new one", num);
LOG_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);
}

14
models/relay_save.c
View file

@ -23,7 +23,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", mdb_strerror(err));
LOG_ERROR("mdb_put error %s\n", mdb_strerror(err));
mdb_txn_abort(mdb_txn);
free(key_data);
return 1;
@ -35,7 +35,7 @@ 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", relay->number, relay);
LOG_TRACE("saving relay %d @ %p\n", relay->number, relay);
int err;
MDB_txn *mdb_txn;
@ -44,13 +44,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", mdb_strerror(err));
LOG_ERROR("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", mdb_strerror(err));
LOG_ERROR("mdb_dbi_open error %s\n", mdb_strerror(err));
exit(1);
}
@ -58,7 +58,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");
LOG_ERROR("failed to save name\n");
return 1;
}
@ -66,7 +66,7 @@ relay_save(relay_t *relay, MDB_env *mdb_env)
value.mv_data = relay->schedule->id;
if(relay_save_single(mdb_txn, mdb_dbi, DB_KEY_RELAY_SCHEDULE_ID, relay->number, value))
{
LOG_ERROR("failed to save ID");
LOG_ERROR("failed to save ID\n");
return 1;
}
@ -77,7 +77,7 @@ relay_save(relay_t *relay, MDB_env *mdb_env)
if(relay_save_single(mdb_txn, mdb_dbi, DB_KEY_RELAY_SCHEDULE_PERIODS, relay->number, value))
{
free(periods_blob);
LOG_ERROR("failed to save periods");
LOG_ERROR("failed to save periods\n");
return 1;
}
free(periods_blob);

8
models/schedule.c
View file

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