From: proller <proller@github.com>
Date: Mon, 16 Sep 2013 22:09:28 +0000 (+0400)
Subject: Add configurable PRAGMA synchronous =
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=4c704fe30673eecad0903683fae627b7226c92d6;p=zefram%2Fminetest%2Fminetest_engine.git

Add configurable PRAGMA synchronous =
---

diff --git a/minetest.conf.example b/minetest.conf.example
index b876ecab..8094100e 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -279,6 +279,8 @@
 #max_objects_per_block = 49
 # Interval of saving important changes in the world
 #server_map_save_interval = 5.3
+# http://www.sqlite.org/pragma.html#pragma_synchronous only numeric values: 0 1 2
+#sqlite_synchronous = 2
 # To reduce lag, block transfers are slowed down when a player is building something.
 # This determines how long they are slowed down after placing or removing a node.
 #full_block_send_enable_min_time_from_building = 2.0
diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
index 17484d48..9714d103 100644
--- a/src/database-sqlite3.cpp
+++ b/src/database-sqlite3.cpp
@@ -108,7 +108,16 @@ void Database_SQLite3::verifyDatabase() {
 		
 		if(needs_create)
 			createDatabase();
-	
+
+		std::string querystr = std::string("PRAGMA synchronous = ")
+				 + itos(g_settings->getU16("sqlite_synchronous"));
+		d = sqlite3_exec(m_database, querystr.c_str(), NULL, NULL, NULL);
+		if(d != SQLITE_OK) {
+			infostream<<"WARNING: Database pragma set failed: "
+					<<sqlite3_errmsg(m_database)<<std::endl;
+			throw FileNotGoodException("Cannot set pragma");
+		}
+
 		d = sqlite3_prepare(m_database, "SELECT `data` FROM `blocks` WHERE `pos`=? LIMIT 1", -1, &m_database_read, NULL);
 		if(d != SQLITE_OK) {
 			infostream<<"WARNING: SQLite3 database read statment failed to prepare: "<<sqlite3_errmsg(m_database)<<std::endl;
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 373a7474..3fbdad4f 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -191,6 +191,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("server_unload_unused_data_timeout", "29");
 	settings->setDefault("max_objects_per_block", "49");
 	settings->setDefault("server_map_save_interval", "5.3");
+	settings->setDefault("sqlite_synchronous", "2");
 	settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
 	settings->setDefault("dedicated_server_step", "0.1");
 	settings->setDefault("ignore_world_load_errors", "false");