oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

Improve error handling of map database creation

Browse source
This commit is contained in:
sfan5 2025-02-26 18:50:41 +01:00
parent 7abaa8d4cd
commit d54646d342
7 changed files with 71 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/servermap.cpp
View file

@ -577,27 +577,34 @@ MapDatabase *ServerMap::createDatabase(
const std::string &savedir,
Settings &conf)
{
MapDatabase *db = nullptr;
if (name == "sqlite3")
return new MapDatabaseSQLite3(savedir);
db = new MapDatabaseSQLite3(savedir);
if (name == "dummy")
return new Database_Dummy();
db = new Database_Dummy();
#if USE_LEVELDB
if (name == "leveldb")
return new Database_LevelDB(savedir);
db = new Database_LevelDB(savedir);
#endif
#if USE_REDIS
if (name == "redis")
return new Database_Redis(conf);
db = new Database_Redis(conf);
#endif
#if USE_POSTGRESQL
if (name == "postgresql") {
std::string connect_string;
conf.getNoEx("pgsql_connection", connect_string);
return new MapDatabasePostgreSQL(connect_string);
db = new MapDatabasePostgreSQL(connect_string);
}
#endif
throw BaseException(std::string("Database backend ") + name + " not supported.");
if (!db)
throw BaseException(std::string("Database backend ") + name + " not supported.");
// Do this to get feedback about errors asap
db->verifyDatabase();
assert(db->initialized());
return db;
}
void ServerMap::beginSave()