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

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);
}