diff options
| author | louiz <louiz@louiz.org> | 2017-06-14 11:11:17 +0200 |
|---|---|---|
| committer | louiz <louiz@louiz.org> | 2017-06-14 11:11:17 +0200 |
| commit | 5ba66c33519567f9f4e806a9ab41c3c94d93237f (patch) | |
| tree | 4b51bece4f4dec660e0c48297404a5da51aee4ec /src/utils | |
| parent | ceb496369f834ffa055eb5b7ffc273b2a21f9b9a (diff) | |
| parent | 2677ac42e8d2e1cf162fec773a9acb453bef8b9b (diff) | |
| download | biboumi-5ba66c33519567f9f4e806a9ab41c3c94d93237f.tar.gz biboumi-5ba66c33519567f9f4e806a9ab41c3c94d93237f.tar.bz2 biboumi-5ba66c33519567f9f4e806a9ab41c3c94d93237f.tar.xz biboumi-5ba66c33519567f9f4e806a9ab41c3c94d93237f.zip | |
Merge branch 'orm' into 'master'
Pure c++ sqlite3 ORM
Closes #3271
See merge request !11
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/reload.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/utils/reload.cpp b/src/utils/reload.cpp index 348c5b5..807a9ab 100644 --- a/src/utils/reload.cpp +++ b/src/utils/reload.cpp @@ -11,6 +11,7 @@ void open_database() #ifdef USE_DATABASE const auto db_filename = Config::get("db_name", xdg_data_path("biboumi.sqlite")); log_info("Opening database: ", db_filename); + Database::close(); Database::open(db_filename); log_info("database successfully opened."); #endif @@ -26,7 +27,7 @@ void reload_process() #ifdef USE_DATABASE try { open_database(); - } catch (const litesql::DatabaseError&) { + } catch (...) { log_warning("Re-using the previous database."); } #endif |