X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fglobal.cpp;h=ec296c1aea3c4112be6b6d7c5af035bfa030d072;hb=14fff12d9df0ee30e2df4bf9d22c2e83065816df;hp=aed8c3e91f52703aa8a79f6b2bff402c478a42d2;hpb=52581afffd81f5a71c129d87e3ac822d9522f12d;p=fms.git

diff --git a/src/global.cpp b/src/global.cpp
index aed8c3e..ec296c1 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -17,7 +17,7 @@
 	#include <xmem.h>
 #endif
 
-bool wantshutdown=false;
+volatile bool wantshutdown=false;
 
 std::string CreateShortIdentityName(const std::string &name, const std::string &publickey)
 {
@@ -39,11 +39,18 @@ void SetupDB()
 {
 
 	DateTime date;
+	std::string tempval="";
 	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
 
 	db->Open("fms.db3");
 	db->SetBusyTimeout(10000);		// set timeout to 10 seconds
-	//db->Execute("VACUUM;");		// not needed every startup
+
+	tempval="";
+	Option::Instance()->Get("VacuumOnStartup",tempval);
+	if(tempval=="true")
+	{
+		db->Execute("VACUUM;");
+	}
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblDBVersion(\
 				Major				INTEGER,\
@@ -508,6 +515,10 @@ void SetupDB()
 	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@bloE1LJ~qzSYUkU2nt7sB9kq060D4HTQC66pk5Q8NpA,DOOASUnp0kj6tOdhZJ-h5Tk7Ka50FSrUgsH7tCG1usU,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
 	// insert Flink's public key
 	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@q2TtkNBOuuniyJ56~8NSopCs3ttwe5KlB31ugZtWmXA,6~PzIupS8YK7L6oFNpXGKJmHT2kBMDfwTg73nHdNur8,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
+	// insert Kane's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@Ofm~yZivDJ5Z2fSzZbMiLEUUQaIc0KHRdZMBTaPLO6I,WLm4s4hNbOOurJ6ijfOq4odz7-dN7uTUvYxJRwWnlMI,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
+	// inserts boardstat's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@aYWBb6zo2AM13XCNhsmmRKMANEx6PG~C15CWjdZziKA,X1pAG4EIqR1gAiyGFVZ1iiw-uTlh460~rFACJ7ZHQXk,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
 
 	// TODO remove sometime after 0.1.17
 	FixCapitalBoardNames();
@@ -860,6 +871,12 @@ void SetupDefaultOptions()
 	st.Step();
 	st.Reset();
 
+	st.Bind(0,"VacuumOnStartup");
+	st.Bind(1,"false");
+	st.Bind(2,"VACUUM the database every time FMS starts.  This will defragment the free space in the database and create a smaller database file.  Vacuuming the database can be CPU and disk intensive.");
+	st.Step();
+	st.Reset();
+
 }
 
 void SetupLogFile()
@@ -899,6 +916,9 @@ void SetupNetwork()
 
 void Shutdown()
 {
+
+	LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"FMS starting shutdown");
+
 	ThreadController::Instance()->ShutdownThreads();
 
 	ShutdownNetwork();