diff options
| author | rubenwardy <rw@rubenwardy.com> | 2020-07-07 17:50:52 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2020-07-07 17:50:52 +0100 |
| commit | 6e4d8de10442eecf71ba36ad015872a135a53338 (patch) | |
| tree | 7d8ccc917c4dd86d33d6c0428e18d87e3c15d003 /src/database/database-sqlite3.h | |
| parent | dc6318b84aa8c079330b2adc711113f7d4b55961 (diff) | |
| download | minetest-6e4d8de10442eecf71ba36ad015872a135a53338.tar.xz | |
Revert "Verify database connection on interval (#9665)"
Fixes #10113
This reverts commit 5c588f89e79e02cba392abe3d00688772321f88b.
Diffstat (limited to 'src/database/database-sqlite3.h')
| -rw-r--r-- | src/database/database-sqlite3.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/database/database-sqlite3.h b/src/database/database-sqlite3.h index 647eddf7a..d7202a918 100644 --- a/src/database/database-sqlite3.h +++ b/src/database/database-sqlite3.h @@ -36,13 +36,13 @@ public: void beginSave(); void endSave(); - // Open and initialize the database if needed - virtual void pingDatabase(); - bool initialized() const { return m_initialized; } protected: Database_SQLite3(const std::string &savedir, const std::string &dbname); + // Open and initialize the database if needed + void verifyDatabase(); + // Convertors inline void str_to_sqlite(sqlite3_stmt *s, int iCol, const std::string &str) const { @@ -146,8 +146,6 @@ public: MapDatabaseSQLite3(const std::string &savedir); virtual ~MapDatabaseSQLite3(); - virtual void pingDatabase() { Database_SQLite3::pingDatabase(); } - bool saveBlock(const v3s16 &pos, const std::string &data); void loadBlock(const v3s16 &pos, std::string *block); bool deleteBlock(const v3s16 &pos); @@ -175,8 +173,6 @@ public: PlayerDatabaseSQLite3(const std::string &savedir); virtual ~PlayerDatabaseSQLite3(); - virtual void pingDatabase() { Database_SQLite3::pingDatabase(); } - void savePlayer(RemotePlayer *player); bool loadPlayer(RemotePlayer *player, PlayerSAO *sao); bool removePlayer(const std::string &name); @@ -212,8 +208,6 @@ public: AuthDatabaseSQLite3(const std::string &savedir); virtual ~AuthDatabaseSQLite3(); - virtual void pingDatabase() { Database_SQLite3::pingDatabase(); } - virtual bool getAuth(const std::string &name, AuthEntry &res); virtual bool saveAuth(const AuthEntry &authEntry); virtual bool createAuth(AuthEntry &authEntry); |