Always do a graceful stop

Author: gaudryc

main/domoticz.cpp

@@ -73,7 +73,6 @@ const char *szHelp=
 	"Usage: Domoticz -www port -verbose x\n"
 	"\t-www port (for example -www 8080, or -www 0 to disable http)\n"
 	"\t-wwwbind address (for example -wwwbind 0.0.0.0 or -wwwbind 192.168.0.20)\n"
-	"\t-wwwgracefulstop boolean (for example -wwwgracefulstop true, default is false)\n"
 #ifdef WWW_ENABLE_SSL
 	"\t-sslwww port (for example -sslwww 443, or -sslwww 0 to disable https)\n"
 	"\t-sslcert file_path (for example /opt/domoticz/server_cert.pem)\n"
@@ -611,17 +610,6 @@ int main(int argc, char**argv)
 		webserver_settings.listening_port = wwwport;
 	}
 
-	if (cmdLine.HasSwitch("-wwwgracefulstop"))
-	{
-		if (cmdLine.GetArgumentCount("-wwwgracefulstop") != 1)
-		{
-			_log.Log(LOG_ERROR, "Please specify true or false to the wwwgracefulstop argument.");
-			return 1;
-		}
-		std::string wwwgracefulstop = cmdLine.GetSafeArgument("-wwwgracefulstop", 0, "false");
-		bool gracefulstop = wwwgracefulstop.compare("true") == 0 ? true : false;
-		webserver_settings.graceful_stop = gracefulstop;
-	}
 	m_mainworker.SetWebserverSettings(webserver_settings);
 #ifdef WWW_ENABLE_SSL
 	http::server::ssl_server_settings secure_webserver_settings;
@@ -639,7 +627,6 @@ int main(int argc, char**argv)
 		// Secure listening address has to be equal
 		secure_webserver_settings.listening_address = webserver_settings.listening_address;
 	}
-	secure_webserver_settings.graceful_stop = webserver_settings.graceful_stop;
 	if (cmdLine.HasSwitch("-sslcert"))
 	{
 		if (cmdLine.GetArgumentCount("-sslcert") != 1)

main/mainworker.cpp

@@ -149,11 +149,9 @@ MainWorker::MainWorker()
 	// Set default settings for web servers
 	m_webserver_settings.listening_address = "::"; // listen to all network interfaces
 	m_webserver_settings.listening_port = "8080";
-	m_webserver_settings.graceful_stop = false;
 #ifdef WWW_ENABLE_SSL
 	m_secure_webserver_settings.listening_address = "::"; // listen to all network interfaces
 	m_secure_webserver_settings.listening_port = "443";
-	m_secure_webserver_settings.graceful_stop = false;
 	m_secure_webserver_settings.ssl_method = "sslv23";
 	m_secure_webserver_settings.certificate_chain_file_path = "./server_cert.pem";
 	m_secure_webserver_settings.ca_cert_file_path = m_secure_webserver_settings.certificate_chain_file_path; // not used

webserver/server.cpp

@@ -91,7 +91,7 @@ void server_base::handle_stop() {
 	} catch (...) {
 		_log.Log(LOG_ERROR, "[web:%s] exception occurred while closing acceptor", settings_.listening_port.c_str());
 	}
-	connection_manager_.stop_all(settings_.graceful_stop);
+	connection_manager_.stop_all(true);
 }
 
 server::server(const server_settings & settings, request_handler & user_request_handler) :

webserver/server_settings.hpp

@@ -20,22 +20,18 @@ struct server_settings {
 public:
 	std::string listening_address;
 	std::string listening_port;
-	bool graceful_stop;
 
 	server_settings() :
-		is_secure_(false),
-		graceful_stop(false) {}
+		is_secure_(false) {}
 	server_settings(const server_settings & s) :
 		is_secure_(s.is_secure_),
 		listening_address(s.listening_address),
-		listening_port(s.listening_port),
-		graceful_stop(s.graceful_stop) {}
+		listening_port(s.listening_port) {}
 	virtual ~server_settings() {}
 	server_settings & operator=(const server_settings & s) {
 		is_secure_ = s.is_secure_;
 		listening_address = s.listening_address;
 		listening_port = s.listening_port;
-		graceful_stop = s.graceful_stop;
 		return *this;
 	}
 	bool is_secure() const {
@@ -53,14 +49,12 @@ struct server_settings {
 		if (listening_port == "0") {
 			listening_port.clear();// server NOT enabled
 		}
-		graceful_stop = settings.graceful_stop;
 	}
 
 	virtual std::string to_string() const {
 		return std::string("'server_settings[is_secure_=") + (is_secure_ == true ? "true" : "false") +
 				", listening_address='" + listening_address + "'" +
 				", listening_port='" + listening_port + "'" +
-				", graceful_stop='" + (graceful_stop ? "true" : "false") + "'" +
 				"]'";
 	}