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

@@ -359,19 +359,6 @@ Instance::FinishShutdownUpdate() noexcept
#endif
}
inline void
Instance::ShutdownDatabase() noexcept
{
#ifdef ENABLE_DATABASE
if (instance->database != nullptr) {
instance->database->Close();
delete instance->database;
}
delete instance->storage;
#endif
}
inline void
Instance::BeginShutdownPartitions() noexcept
{
@@ -648,7 +635,6 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
#endif
instance->FinishShutdownUpdate();
instance->ShutdownDatabase();
#ifdef ENABLE_SQLITE
sticker_global_finish();