paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-01 20:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

meas: Do not retry to close the database

Browse Source 
There is no concurrency involved and if it failed the first time,
it will fail the second, third, ... time as well. Simply print that
we will leak the database instance.
This commit is contained in:
Holger Hans Peter Freyther
2016-03-15 14:21:49 +01:00
parent 961bd0b121
commit 8c515272c3
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openbsc/src/utils/meas_db.c
View File

@@ -314,7 +314,6 @@ err_io:
void meas_db_close(struct meas_db_state *st)
{
int retries;
if (sqlite3_finalize(st->stmt_ins_mr) != SQLITE_OK)
fprintf(stderr, "DB insert measurement report finalize error: %s\n",
sqlite3_errmsg(st->db));
@@ -324,16 +323,8 @@ void meas_db_close(struct meas_db_state *st)
if (sqlite3_finalize(st->stmt_upd_mr) != SQLITE_OK)
fprintf(stderr, "DB update measurement report finalize error: %s\n",
sqlite3_errmsg(st->db));
retries = 0;
while (1) {
if (sqlite3_close(st->db) == SQLITE_OK)
break;
if ((++retries) >= 3) {
fprintf(stderr, "Unable to close DB, abandoning.\n");
break;
}
sleep(1);
}
if (sqlite3_close(st->db) != SQLITE_OK)
fprintf(stderr, "Unable to close DB, abandoning.\n");
talloc_free(st);