The path to the application directory is passed to the initialization function

awwit · awwit · commit db3d837d8c89 · 2017-04-12T22:45:58.000+03:00
diff --git a/src/server/Server.cpp b/src/server/Server.cpp
@@ -289,18 +289,19 @@ namespace HttpServer
 				{
 					if (app->application_final)
 					{
-						app->application_final();
+						const std::string root = app->root_dir;
+						app->application_final(root.data() );
 					}
 				}
 				catch (std::exception &exc)
 				{
-					std::cout << "Warning: error when the application finishes '" << app->server_module << "':" << exc.what() << std::endl;
+					std::cout << "Warning: an exception was thrown when the application '" << app->server_module << "' was finishes: " << exc.what() << std::endl;
 				}
 
 				app->application_call = std::function<int(Transfer::app_request *, Transfer::app_response *)>();
 				app->application_clear = std::function<void(void *, size_t)>();
-				app->application_init = std::function<bool()>();
-				app->application_final = std::function<void()>();
+				app->application_init = std::function<bool(const char *)>();
+				app->application_final = std::function<void(const char *)>();
 			}
 		}
 
@@ -423,18 +424,18 @@ namespace HttpServer
 
 		std::function<void(void *, size_t)> app_clear = reinterpret_cast<void(*)(void *, size_t)>(addr);
 
-		std::function<bool()> app_init = std::function<bool()>();
+		std::function<bool(const char *)> app_init = std::function<bool(const char *)>();
 
 		if (module.find("application_init", &addr) )
 		{
-			app_init = reinterpret_cast<bool(*)()>(addr);
+			app_init = reinterpret_cast<bool(*)(const char *)>(addr);
 		}
 
-		std::function<void()> app_final = std::function<void()>();
+		std::function<void(const char *)> app_final = std::function<void(const char *)>();
 
 		if (module.find("application_final", &addr) )
 		{
-			app_final = reinterpret_cast<void(*)()>(addr);
+			app_final = reinterpret_cast<void(*)(const char *)>(addr);
 		}
 
 		for (auto &app : same)
@@ -448,12 +449,13 @@ namespace HttpServer
 			{
 				if (app->application_init)
 				{
-					app->application_init();
+					const std::string root = app->root_dir;
+					app->application_init(root.data() );
 				}
 			}
 			catch (std::exception &exc)
 			{
-				std::cout << "Warning: error when initializing the application '" << module_name << "':" << exc.what() << std::endl;
+				std::cout << "Warning: an exception was thrown when the application '" << module_name << "' was initialized: " << exc.what() << std::endl;
 			}
 		}
 
@@ -502,7 +504,7 @@ namespace HttpServer
 			}
 		}
 
-		std::cout << "Notice: applications' modules have been updated;" << std::endl;
+		std::cout << "Notice: application modules have been updated;" << std::endl;
 
 		this->controls.setProcess();
 		this->controls.eventUpdateModule->reset();
@@ -780,7 +782,7 @@ namespace HttpServer
 			sockets_list.addSocket(sock);
 		}
 
-		std::cout << "Log: launch server's cycle;" << std::endl << std::endl;
+		std::cout << "Log: server started work;" << std::endl << std::endl;
 
 		constexpr size_t queue_max_length = 1024;
 		this->controls.eventNotFullQueue = new Utils::Event(true, true);
@@ -855,7 +857,7 @@ namespace HttpServer
 
 		this->clear();
 
-		std::cout << "Log: complete server's cycle;" << std::endl;
+		std::cout << "Log: server work completed;" << std::endl;
 
 		return EXIT_SUCCESS;
 	}
diff --git a/src/server/ServerApplicationSettings.h b/src/server/ServerApplicationSettings.h
@@ -31,7 +31,7 @@ namespace HttpServer
 
 		std::function<int(Transfer::app_request *, Transfer::app_response *)> application_call;
 		std::function<void(void *, size_t)> application_clear;
-		std::function<bool()> application_init;
-		std::function<void()> application_final;
+		std::function<bool(const char *)> application_init;
+		std::function<void(const char *)> application_final;
 	};
 };
diff --git a/src/server/ServerSettings.cpp b/src/server/ServerSettings.cpp
@@ -38,12 +38,13 @@ namespace HttpServer
 				{
 					if (app->application_final)
 					{
-						app->application_final();
+						const std::string root = app->root_dir;
+						app->application_final(root.data() );
 					}
 				}
 				catch (std::exception &exc)
 				{
-					std::cout << "Warning: the error of the application's finalize '" << app->server_module << "':" << exc.what() << std::endl;
+					std::cout << "Warning: an exception was thrown when the application '" << app->server_module << "' was finishes: " << exc.what() << std::endl;
 				}
 
 				delete app;
diff --git a/src/server/config/ConfigParser.cpp b/src/server/config/ConfigParser.cpp
@@ -244,18 +244,33 @@ namespace HttpServer
 
 		std::function<void(void *, size_t)> app_clear = reinterpret_cast<void(*)(void *, size_t)>(addr);
 
-		std::function<bool()> app_init = std::function<bool()>();
+		std::function<bool(const char *)> app_init = std::function<bool(const char *)>();
 
 		if (module.find("application_init", &addr) )
 		{
-			app_init = reinterpret_cast<bool(*)()>(addr);
+			app_init = reinterpret_cast<bool(*)(const char *)>(addr);
 		}
 
-		std::function<void()> app_final = std::function<void()>();
+		std::function<void(const char *)> app_final = std::function<void(const char *)>();
 
 		if (module.find("application_final", &addr) )
 		{
-			app_final = reinterpret_cast<void(*)()>(addr);
+			app_final = reinterpret_cast<void(*)(const char *)>(addr);
+		}
+
+		std::string root_dir = it_root_dir->second;
+
+	#ifdef WIN32
+		if ('\\' == root_dir.back() )
+		{
+			root_dir.pop_back();
+		}
+	#endif
+
+		// Remove back slash from root_dir
+		if ('/' == root_dir.back() )
+		{
+			root_dir.pop_back();
 		}
 
 		bool success = true;
@@ -264,17 +279,21 @@ namespace HttpServer
 		{
 			if (app_init)
 			{
-				success = app_init();
+				const std::string root = root_dir;
+				success = app_init(root.data() );
 			}
 		}
-		catch (...)
+		catch (std::exception &exc)
 		{
+			std::cout << "Warning: an exception was thrown when the application '" << it_module->second << "' was initialized: " << exc.what() << std::endl;
+
 			success = false;
 		}
 
 		if (false == success)
 		{
 			std::cout << "Warning: error when initializing application '" << it_module->second << "';" << std::endl;
+
 			return false;
 		}
 
@@ -308,21 +327,6 @@ namespace HttpServer
 			modules.emplace_back(std::move(module) );
 		}
 
-		std::string root_dir = it_root_dir->second;
-
-	#ifdef WIN32
-		if ('\\' == root_dir.back() )
-		{
-			root_dir.pop_back();
-		}
-	#endif
-
-		// Remove back slash from root_dir
-		if ('/' == root_dir.back() )
-		{
-			root_dir.pop_back();
-		}
-
 		// Create application settings struct
 		ServerApplicationSettings *settings = new ServerApplicationSettings {
 			std::move(ports),
diff --git a/src/server/protocol/ServerHttp1.cpp b/src/server/protocol/ServerHttp1.cpp
@@ -54,9 +54,12 @@ namespace HttpServer
 
 	long ServerHttp1::sendData(const void *src, size_t size, const std::chrono::milliseconds &timeout, DataTransfer *dt) const
 	{
-		long send_size = this->sock.nonblock_send(src, size, timeout);
+		const long send_size = this->sock.nonblock_send(src, size, timeout);
 
-		dt->send_total += send_size;
+		if (send_size > 0)
+		{
+			dt->send_total += send_size;
+		}
 
 		return send_size;
 	}

Original file line number	Diff line number	Diff line change
`@@ -289,18 +289,19 @@ namespace HttpServer`
`289`	`289`	`{`
`290`	`290`	`if (app->application_final)`
`291`	`291`	`{`
`292`		`- app->application_final();`
	`292`	`+ const std::string root = app->root_dir;`
	`293`	`+ app->application_final(root.data() );`
`293`	`294`	`}`
`294`	`295`	`}`
`295`	`296`	`catch (std::exception &exc)`
`296`	`297`	`{`
`297`		`- std::cout << "Warning: error when the application finishes '" << app->server_module << "':" << exc.what() << std::endl;`
	`298`	`+ std::cout << "Warning: an exception was thrown when the application '" << app->server_module << "' was finishes: " << exc.what() << std::endl;`
`298`	`299`	`}`
`299`	`300`
`300`	`301`	`app->application_call = std::function<int(Transfer::app_request , Transfer::app_response )>();`
`301`	`302`	`app->application_clear = std::function<void(void *, size_t)>();`
`302`		`- app->application_init = std::function<bool()>();`
`303`		`- app->application_final = std::function<void()>();`
	`303`	`+ app->application_init = std::function<bool(const char *)>();`
	`304`	`+ app->application_final = std::function<void(const char *)>();`
`304`	`305`	`}`
`305`	`306`	`}`
`306`	`307`
`@@ -423,18 +424,18 @@ namespace HttpServer`
`423`	`424`
`424`	`425`	`std::function<void(void , size_t)> app_clear = reinterpret_cast<void()(void *, size_t)>(addr);`
`425`	`426`
`426`		`- std::function<bool()> app_init = std::function<bool()>();`
	`427`	`+ std::function<bool(const char )> app_init = std::function<bool(const char )>();`
`427`	`428`
`428`	`429`	`if (module.find("application_init", &addr) )`
`429`	`430`	`{`
`430`		`- app_init = reinterpret_cast<bool(*)()>(addr);`
	`431`	`+ app_init = reinterpret_cast<bool()(const char )>(addr);`
`431`	`432`	`}`
`432`	`433`
`433`		`- std::function<void()> app_final = std::function<void()>();`
	`434`	`+ std::function<void(const char )> app_final = std::function<void(const char )>();`
`434`	`435`
`435`	`436`	`if (module.find("application_final", &addr) )`
`436`	`437`	`{`
`437`		`- app_final = reinterpret_cast<void(*)()>(addr);`
	`438`	`+ app_final = reinterpret_cast<void()(const char )>(addr);`
`438`	`439`	`}`
`439`	`440`
`440`	`441`	`for (auto &app : same)`
`@@ -448,12 +449,13 @@ namespace HttpServer`
`448`	`449`	`{`
`449`	`450`	`if (app->application_init)`
`450`	`451`	`{`
`451`		`- app->application_init();`
	`452`	`+ const std::string root = app->root_dir;`
	`453`	`+ app->application_init(root.data() );`
`452`	`454`	`}`
`453`	`455`	`}`
`454`	`456`	`catch (std::exception &exc)`
`455`	`457`	`{`
`456`		`- std::cout << "Warning: error when initializing the application '" << module_name << "':" << exc.what() << std::endl;`
	`458`	`+ std::cout << "Warning: an exception was thrown when the application '" << module_name << "' was initialized: " << exc.what() << std::endl;`
`457`	`459`	`}`
`458`	`460`	`}`
`459`	`461`
`@@ -502,7 +504,7 @@ namespace HttpServer`
`502`	`504`	`}`
`503`	`505`	`}`
`504`	`506`
`505`		`- std::cout << "Notice: applications' modules have been updated;" << std::endl;`
	`507`	`+ std::cout << "Notice: application modules have been updated;" << std::endl;`
`506`	`508`
`507`	`509`	`this->controls.setProcess();`
`508`	`510`	`this->controls.eventUpdateModule->reset();`
`@@ -780,7 +782,7 @@ namespace HttpServer`
`780`	`782`	`sockets_list.addSocket(sock);`
`781`	`783`	`}`
`782`	`784`
`783`		`- std::cout << "Log: launch server's cycle;" << std::endl << std::endl;`
	`785`	`+ std::cout << "Log: server started work;" << std::endl << std::endl;`
`784`	`786`
`785`	`787`	`constexpr size_t queue_max_length = 1024;`
`786`	`788`	`this->controls.eventNotFullQueue = new Utils::Event(true, true);`
`@@ -855,7 +857,7 @@ namespace HttpServer`
`855`	`857`
`856`	`858`	`this->clear();`
`857`	`859`
`858`		`- std::cout << "Log: complete server's cycle;" << std::endl;`
	`860`	`+ std::cout << "Log: server work completed;" << std::endl;`
`859`	`861`
`860`	`862`	`return EXIT_SUCCESS;`
`861`	`863`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,13 @@ namespace HttpServer`
`38`	`38`	`{`
`39`	`39`	`if (app->application_final)`
`40`	`40`	`{`
`41`		`- app->application_final();`
	`41`	`+ const std::string root = app->root_dir;`
	`42`	`+ app->application_final(root.data() );`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`catch (std::exception &exc)`
`45`	`46`	`{`
`46`		`- std::cout << "Warning: the error of the application's finalize '" << app->server_module << "':" << exc.what() << std::endl;`
	`47`	`+ std::cout << "Warning: an exception was thrown when the application '" << app->server_module << "' was finishes: " << exc.what() << std::endl;`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`delete app;`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,12 @@ namespace HttpServer`
`54`	`54`
`55`	`55`	`long ServerHttp1::sendData(const void src, size_t size, const std::chrono::milliseconds &timeout, DataTransfer dt) const`
`56`	`56`	`{`
`57`		`- long send_size = this->sock.nonblock_send(src, size, timeout);`
	`57`	`+ const long send_size = this->sock.nonblock_send(src, size, timeout);`
`58`	`58`
`59`		`- dt->send_total += send_size;`
	`59`	`+ if (send_size > 0)`
	`60`	`+ {`
	`61`	`+ dt->send_total += send_size;`
	`62`	`+ }`
`60`	`63`
`61`	`64`	`return send_size;`
`62`	`65`	`}`