Instance: eliminate ShutdownDatabase(), move code to destructor

Destruct automatically, even if leaving the scope due to exception
being thrown.
This commit is contained in:
Max Kellermann
2019-02-15 18:03:43 +01:00
parent 9aa75e738c
commit 99c23cf139
3 changed files with 13 additions and 16 deletions

View File

@@ -30,6 +30,8 @@
#ifdef ENABLE_DATABASE
#include "db/DatabaseError.hxx"
#include "db/Interface.hxx"
#include "storage/StorageInterface.hxx"
#ifdef ENABLE_SQLITE
#include "sticker/StickerDatabase.hxx"
@@ -48,7 +50,17 @@ Instance::Instance()
{
}
Instance::~Instance() noexcept = default;
Instance::~Instance() noexcept
{
#ifdef ENABLE_DATABASE
if (database != nullptr) {
database->Close();
delete database;
}
delete storage;
#endif
}
Partition *
Instance::FindPartition(const char *name) noexcept