emgauwa/core-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:00:05 +02:00
parent 3e6d0333b7
commit 398019afe8
36 changed files with 256 additions and 188 deletions

6
src/models/controller.c
View file

@ -101,7 +101,7 @@ controller_db_select(sqlite3_stmt *stmt)
}
else
{
LOG_ERROR("error selecting controllers from database: %s\n", sqlite3_errstr(s));
LOGGER_ERR("error selecting controllers from database: %s\n", sqlite3_errstr(s));
break;
}
}
@ -130,11 +130,11 @@ controller_save(controller_t *controller)
{
if(controller->id)
{
LOG_ERROR("error inserting data: %s\n", sqlite3_errmsg(global_database));
LOGGER_ERR("error inserting data: %s\n", sqlite3_errmsg(global_database));
}
else
{
LOG_ERROR("error updating data: %s\n", sqlite3_errmsg(global_database));
LOGGER_ERR("error updating data: %s\n", sqlite3_errmsg(global_database));
}
}
else

2
src/models/junction_relay_schedule.c
View file

@ -21,7 +21,7 @@ junction_relay_schedule_insert(uint8_t weekday, int relay_id, int schedule_id)
rc = sqlite3_step(stmt);
if (rc != SQLITE_DONE)
{
LOG_ERROR("error inserting data: %s", sqlite3_errmsg(global_database));
LOGGER_ERR("error inserting data: %s", sqlite3_errmsg(global_database));
return false;
}

2
src/models/junction_tag.c
View file

@ -78,7 +78,7 @@ get_ids(sqlite3_stmt *stmt)
}
else
{
LOG_ERROR("error selecting relays from database: %s\n", sqlite3_errstr(s));
LOGGER_ERR("error selecting relays from database: %s\n", sqlite3_errstr(s));
sqlite3_finalize(stmt);
return NULL;
}

18
src/models/relay.c
View file

@ -69,7 +69,7 @@ relay_db_select_mapper(sqlite3_stmt *stmt)
{
if(schedules[i] == NULL)
{
LOG_ERROR("got only %d/7 schedules for relay_id %d\n", i, new_relay->id);
LOGGER_ERR("got only %d/7 schedules for relay_id %d\n", i, new_relay->id);
relay_free(new_relay);
free(schedules);
return NULL;
@ -111,7 +111,7 @@ relay_db_select(sqlite3_stmt *stmt)
}
else
{
LOG_ERROR("error selecting relays from database: %s\n", sqlite3_errstr(s));
LOGGER_ERR("error selecting relays from database: %s\n", sqlite3_errstr(s));
break;
}
}
@ -140,11 +140,11 @@ relay_save(relay_t *relay)
{
if(relay->id)
{
LOG_ERROR("error inserting data: %s\n", sqlite3_errmsg(global_database));
LOGGER_ERR("error inserting data: %s\n", sqlite3_errmsg(global_database));
}
else
{
LOG_ERROR("error updating data: %s\n", sqlite3_errmsg(global_database));
LOGGER_ERR("error updating data: %s\n", sqlite3_errmsg(global_database));
}
}
else
@ -203,7 +203,7 @@ relay_to_json(relay_t *relay)
cJSON *json_number = cJSON_CreateNumber(relay->number);
if(json_number == NULL)
{
LOG_DEBUG("failed to make number\n");
LOGGER_DEBUG("failed to make number\n");
cJSON_Delete(json);
return NULL;
}
@ -212,7 +212,7 @@ relay_to_json(relay_t *relay)
cJSON *json_name = cJSON_CreateString(relay->name);
if(json_name == NULL)
{
LOG_DEBUG("failed to make name\n");
LOGGER_DEBUG("failed to make name\n");
cJSON_Delete(json);
return NULL;
}
@ -221,7 +221,7 @@ relay_to_json(relay_t *relay)
controller_t *controller = controller_get_by_id(relay->controller_id);
if(!controller)
{
LOG_WARN("failed to get controller\n");
LOGGER_WARNING("failed to get controller\n");
cJSON_Delete(json);
return NULL;
}
@ -231,7 +231,7 @@ relay_to_json(relay_t *relay)
cJSON *json_controller_id = cJSON_CreateString(uuid_str);
if(json_controller_id == NULL)
{
LOG_DEBUG("failed to make controller id\n");
LOGGER_DEBUG("failed to make controller id\n");
cJSON_Delete(json);
return NULL;
}
@ -278,7 +278,7 @@ relay_to_json(relay_t *relay)
cJSON *json_tag = cJSON_CreateString(tag);
if (json_tag == NULL)
{
LOG_DEBUG("failed to add tag from string '%s'\n", tag);
LOGGER_DEBUG("failed to add tag from string '%s'\n", tag);
free(tag);
continue;
}

12
src/models/schedule.c
View file

@ -96,7 +96,7 @@ schedule_db_select(sqlite3_stmt *stmt)
}
else
{
LOG_ERROR("error selecting schedules from database: %s\n", sqlite3_errstr(s));
LOGGER_ERR("error selecting schedules from database: %s\n", sqlite3_errstr(s));
break;
}
}
@ -125,11 +125,11 @@ schedule_save(schedule_t *schedule)
{
if(schedule->id)
{
LOG_ERROR("error inserting data: %s\n", sqlite3_errmsg(global_database));
LOGGER_ERR("error inserting data: %s\n", sqlite3_errmsg(global_database));
}
else
{
LOG_ERROR("error updating data: %s\n", sqlite3_errmsg(global_database));
LOGGER_ERR("error updating data: %s\n", sqlite3_errmsg(global_database));
}
}
else
@ -262,7 +262,7 @@ schedule_to_json(schedule_t *schedule)
cJSON *json_period_start = cJSON_CreateString(start_str);
if (json_period_start == NULL)
{
LOG_DEBUG("failed to add start period from string '%s'\n", start_str);
LOGGER_DEBUG("failed to add start period from string '%s'\n", start_str);
cJSON_Delete(json_period);
continue;
}
@ -271,7 +271,7 @@ schedule_to_json(schedule_t *schedule)
cJSON *json_period_end = cJSON_CreateString(end_str);
if (json_period_end == NULL)
{
LOG_DEBUG("failed to add end period from string '%s'\n", end_str);
LOGGER_DEBUG("failed to add end period from string '%s'\n", end_str);
cJSON_Delete(json_period);
continue;
}
@ -295,7 +295,7 @@ schedule_to_json(schedule_t *schedule)
cJSON *json_tag = cJSON_CreateString(tag);
if (json_tag == NULL)
{
LOG_DEBUG("failed to add tag from string '%s'\n", tag);
LOGGER_DEBUG("failed to add tag from string '%s'\n", tag);
free(tag);
continue;
}

8
src/models/tag.c
View file

@ -27,7 +27,7 @@ tag_save(int id, const char *tag)
rc = sqlite3_step(stmt);
if (rc != SQLITE_DONE)
{
LOG_ERROR("error saving tag: %s\n", sqlite3_errmsg(global_database));
LOGGER_ERR("error saving tag: %s\n", sqlite3_errmsg(global_database));
return false;
}
@ -65,7 +65,7 @@ tag_get_tag(int id)
}
else
{
LOG_ERROR("error selecting tags from database: %s\n", sqlite3_errstr(s));
LOGGER_ERR("error selecting tags from database: %s\n", sqlite3_errstr(s));
sqlite3_finalize(stmt);
return NULL;
}
@ -111,7 +111,7 @@ tag_get_all()
}
else
{
LOG_ERROR("error selecting tags from database: %s\n", sqlite3_errstr(s));
LOGGER_ERR("error selecting tags from database: %s\n", sqlite3_errstr(s));
break;
}
}
@ -148,7 +148,7 @@ tag_get_id(const char *tag)
}
else
{
LOG_ERROR("error selecting tags from database: %s\n", sqlite3_errstr(s));
LOGGER_ERR("error selecting tags from database: %s\n", sqlite3_errstr(s));
sqlite3_finalize(stmt);
return 0;
}