oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Revert "Verify database connection on interval (#9665)"

Browse source 
Fixes #10113

This reverts commit 5c588f89e7.
This commit is contained in:
rubenwardy 2020-07-07 17:50:52 +01:00
parent dc6318b84a
commit 6e4d8de104
9 changed files with 33 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/database/database-postgresql.h
View file

@ -32,14 +32,13 @@ public:
Database_PostgreSQL(const std::string &connect_string);
~Database_PostgreSQL();
virtual void pingDatabase();
void beginSave();
void endSave();
void rollback();
bool initialized() const;
protected:
// Conversion helpers
inline int pg_to_int(PGresult *res, int row, int col)
@ -84,6 +83,7 @@ protected:
}
void createTableIfNotExists(const std::string &table_name, const std::string &definition);
void verifyDatabase();
// Database initialization
void connectToDatabase();
@ -114,8 +114,6 @@ public:
MapDatabasePostgreSQL(const std::string &connect_string);
virtual ~MapDatabasePostgreSQL() = default;
virtual void pingDatabase() { Database_PostgreSQL::pingDatabase(); }
bool saveBlock(const v3s16 &pos, const std::string &data);
void loadBlock(const v3s16 &pos, std::string *block);
bool deleteBlock(const v3s16 &pos);
@ -135,8 +133,6 @@ public:
PlayerDatabasePostgreSQL(const std::string &connect_string);
virtual ~PlayerDatabasePostgreSQL() = default;
virtual void pingDatabase() { Database_PostgreSQL::pingDatabase(); }
void savePlayer(RemotePlayer *player);
bool loadPlayer(RemotePlayer *player, PlayerSAO *sao);
bool removePlayer(const std::string &name);