Fixed signal processing (and termination) for Windows

awwit · awwit · commit d424a62d5d3e · 2017-05-10T00:11:31.000+03:00
diff --git a/src/SignalHandlers.cpp b/src/SignalHandlers.cpp
@@ -21,7 +21,7 @@ static void handlerSigTerm(const int) noexcept
 {
 	if (globalServerPtr)
 	{
-		globalServerPtr->controls.stopProcess();
+		globalServerPtr->stop();
 	}
 }
 
@@ -32,7 +32,7 @@ static void handlerSigInt(const int) noexcept
 {
 	if (globalServerPtr)
 	{
-		globalServerPtr->controls.stopProcess();
+		globalServerPtr->stop();
 	}
 }
 
@@ -43,8 +43,7 @@ static void handlerSigUsr1(const int) noexcept
 {
 	if (globalServerPtr)
 	{
-		globalServerPtr->controls.setRestart();
-		globalServerPtr->controls.stopProcess();
+		globalServerPtr->restart();
 	}
 }
 
@@ -55,9 +54,7 @@ static void handlerSigUsr2(const int) noexcept
 {
 	if (globalServerPtr)
 	{
-		globalServerPtr->controls.setUpdateModule();
-		globalServerPtr->controls.setProcess(false);
-		globalServerPtr->controls.setProcessQueue();
+		globalServerPtr->update();
 	}
 }
 
@@ -108,7 +105,7 @@ static ::LRESULT CALLBACK WndProc(const ::HWND hWnd, const ::UINT message, const
 
 		case WM_ENDSESSION:
 		{
-			::HANDLE hThread = ::OpenThread(SYNCHRONIZE, false, gMainThreadId);
+			const ::HANDLE hThread = ::OpenThread(SYNCHRONIZE, false, gMainThreadId);
 			::WaitForSingleObject(hThread, INFINITE);
 			::CloseHandle(hThread);
 			break;
@@ -158,7 +155,7 @@ static ::BOOL consoleSignalHandler(const ::DWORD ctrlType) noexcept
 	case CTRL_SHUTDOWN_EVENT:
 	{
 		handlerSigTerm(ctrlType);
-		::HANDLE hThread = ::OpenThread(SYNCHRONIZE, false, gMainThreadId);
+		const ::HANDLE hThread = ::OpenThread(SYNCHRONIZE, false, gMainThreadId);
 		::WaitForSingleObject(hThread, INFINITE);
 		::CloseHandle(hThread);
 		return true;
@@ -190,7 +187,7 @@ bool bindSignalHandlers(HttpServer::Server *server) noexcept
 
 	const ::HINSTANCE hInstance = ::GetModuleHandle(nullptr);
 
-	::WNDCLASSEX wcex = {};
+	::WNDCLASSEX wcex {};
 
 	wcex.cbSize = sizeof(::WNDCLASSEX);
 	wcex.lpfnWndProc = WndProc;
@@ -211,7 +208,7 @@ bool bindSignalHandlers(HttpServer::Server *server) noexcept
 
 #elif POSIX
 
-	struct ::sigaction act = {};
+	struct ::sigaction act {};
 
 	act.sa_handler = handlerSigInt;
 	::sigaction(SIGINT, &act, nullptr);
diff --git a/src/server/Server.cpp b/src/server/Server.cpp
@@ -1009,6 +1009,36 @@ namespace HttpServer
 		return code;
 	}
 
+	static void close_liseners(std::vector<Socket::Socket> &liseners)
+	{
+		for (auto &sock : liseners)
+		{
+			sock.close();
+		}
+	}
+
+	void Server::stop()
+	{
+		this->controls.stopProcess();
+
+		close_liseners(this->liseners);
+	}
+
+	void Server::restart()
+	{
+		this->controls.setRestart();
+		this->controls.stopProcess();
+
+		close_liseners(this->liseners);
+	}
+
+	void Server::update()
+	{
+		this->controls.setUpdateModule();
+		this->controls.setProcess(false);
+		this->controls.setProcessQueue();
+	}
+
 	System::native_processid_type Server::getServerProcessId(const std::string &serverName)
 	{
 		System::native_processid_type pid = 0;
diff --git a/src/server/Server.h b/src/server/Server.h
@@ -53,6 +53,10 @@ namespace HttpServer
 	public:
 		Server() = default;
 
+		void stop();
+		void restart();
+		void update();
+
 		int command_help(const int argc, const char *argv[]) const;
 		int command_start(const int argc, const char *argv[]);
 		int command_restart(const int argc, const char *argv[]) const;

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ static void handlerSigTerm(const int) noexcept`
`21`	`21`	`{`
`22`	`22`	`if (globalServerPtr)`
`23`	`23`	`{`
`24`		`- globalServerPtr->controls.stopProcess();`
	`24`	`+ globalServerPtr->stop();`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`@@ -32,7 +32,7 @@ static void handlerSigInt(const int) noexcept`
`32`	`32`	`{`
`33`	`33`	`if (globalServerPtr)`
`34`	`34`	`{`
`35`		`- globalServerPtr->controls.stopProcess();`
	`35`	`+ globalServerPtr->stop();`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`@@ -43,8 +43,7 @@ static void handlerSigUsr1(const int) noexcept`
`43`	`43`	`{`
`44`	`44`	`if (globalServerPtr)`
`45`	`45`	`{`
`46`		`- globalServerPtr->controls.setRestart();`
`47`		`- globalServerPtr->controls.stopProcess();`
	`46`	`+ globalServerPtr->restart();`
`48`	`47`	`}`
`49`	`48`	`}`
`50`	`49`
`@@ -55,9 +54,7 @@ static void handlerSigUsr2(const int) noexcept`
`55`	`54`	`{`
`56`	`55`	`if (globalServerPtr)`
`57`	`56`	`{`
`58`		`- globalServerPtr->controls.setUpdateModule();`
`59`		`- globalServerPtr->controls.setProcess(false);`
`60`		`- globalServerPtr->controls.setProcessQueue();`
	`57`	`+ globalServerPtr->update();`
`61`	`58`	`}`
`62`	`59`	`}`
`63`	`60`
`@@ -108,7 +105,7 @@ static ::LRESULT CALLBACK WndProc(const ::HWND hWnd, const ::UINT message, const`
`108`	`105`
`109`	`106`	`case WM_ENDSESSION:`
`110`	`107`	`{`
`111`		`- ::HANDLE hThread = ::OpenThread(SYNCHRONIZE, false, gMainThreadId);`
	`108`	`+ const ::HANDLE hThread = ::OpenThread(SYNCHRONIZE, false, gMainThreadId);`
`112`	`109`	`::WaitForSingleObject(hThread, INFINITE);`
`113`	`110`	`::CloseHandle(hThread);`
`114`	`111`	`break;`
`@@ -158,7 +155,7 @@ static ::BOOL consoleSignalHandler(const ::DWORD ctrlType) noexcept`
`158`	`155`	`case CTRL_SHUTDOWN_EVENT:`
`159`	`156`	`{`
`160`	`157`	`handlerSigTerm(ctrlType);`
`161`		`- ::HANDLE hThread = ::OpenThread(SYNCHRONIZE, false, gMainThreadId);`
	`158`	`+ const ::HANDLE hThread = ::OpenThread(SYNCHRONIZE, false, gMainThreadId);`
`162`	`159`	`::WaitForSingleObject(hThread, INFINITE);`
`163`	`160`	`::CloseHandle(hThread);`
`164`	`161`	`return true;`
`@@ -190,7 +187,7 @@ bool bindSignalHandlers(HttpServer::Server *server) noexcept`
`190`	`187`
`191`	`188`	`const ::HINSTANCE hInstance = ::GetModuleHandle(nullptr);`
`192`	`189`
`193`		`- ::WNDCLASSEX wcex = {};`
	`190`	`+ ::WNDCLASSEX wcex {};`
`194`	`191`
`195`	`192`	`wcex.cbSize = sizeof(::WNDCLASSEX);`
`196`	`193`	`wcex.lpfnWndProc = WndProc;`
`@@ -211,7 +208,7 @@ bool bindSignalHandlers(HttpServer::Server *server) noexcept`
`211`	`208`
`212`	`209`	`#elif POSIX`
`213`	`210`
`214`		`- struct ::sigaction act = {};`
	`211`	`+ struct ::sigaction act {};`
`215`	`212`
`216`	`213`	`act.sa_handler = handlerSigInt;`
`217`	`214`	`::sigaction(SIGINT, &act, nullptr);`