Added output of messages with exceptions.

awwit · awwit · commit a3389a3fee20 · 2018-05-31T16:12:19.000+03:00
diff --git a/src/server/Server.cpp b/src/server/Server.cpp
@@ -313,7 +313,7 @@ namespace HttpServer
 						app->application_final(root.data() );
 					}
 				}
-				catch (std::exception &exc) {
+				catch (const std::exception &exc) {
 					std::cout << "Warning: an exception was thrown when the application '"
 						<< app->server_module << "' was finishes: " << exc.what() << std::endl;
 				}
@@ -460,7 +460,7 @@ namespace HttpServer
 					app->application_init(root.data() );
 				}
 			}
-			catch (std::exception &exc) {
+			catch (const std::exception &exc) {
 				std::cout << "Warning: an exception was thrown when the application '" << module_name << "' was initialized: " << exc.what() << std::endl;
 			}
 		}
diff --git a/src/server/ServerSettings.cpp b/src/server/ServerSettings.cpp
@@ -34,15 +34,13 @@ namespace HttpServer
 
 			for (auto &app : applications)
 			{
-				try
-				{
+				try {
 					if (app->application_final) {
 						const std::string root = app->root_dir;
 						app->application_final(root.data() );
 					}
 				}
-				catch (std::exception &exc)
-				{
+				catch (const std::exception &exc) {
 					std::cout << "Warning: an exception was thrown when the application '" << app->server_module << "' was finishes: " << exc.what() << std::endl;
 				}
 
diff --git a/src/server/config/ConfigParser.cpp b/src/server/config/ConfigParser.cpp
@@ -283,7 +283,7 @@ namespace HttpServer
 				success = app_init(root.data() );
 			}
 		}
-		catch (std::exception &exc) {
+		catch (const std::exception &exc) {
 			std::cout << "Warning: an exception was thrown when the application '" << it_module->second << "' was initialized: " << exc.what() << std::endl;
 			success = false;
 		}
diff --git a/src/server/protocol/ServerProtocol.cpp b/src/server/protocol/ServerProtocol.cpp
@@ -2,6 +2,8 @@
 #include "ServerProtocol.h"
 #include "../../utils/Utils.h"
 
+#include <iostream>
+
 namespace HttpServer
 {
 	ServerProtocol::ServerProtocol(
@@ -167,8 +169,9 @@ namespace HttpServer
 			// Launch application
 			req.app_exit_code = appSets.application_call(&request, &response);
 		}
-		catch (std::exception &exc) {
-			// TODO: exception output
+		catch (const std::exception &exc) {
+			// Exception output
+			std::cout << "Exception when application_call: " << exc.what() << std::endl;
 		}
 
 		if (response.response_data && response.data_size)
@@ -181,8 +184,9 @@ namespace HttpServer
 			try {
 				appSets.application_clear(response.response_data, response.data_size);
 			}
-			catch (std::exception &exc) {
-				// TODO: exception output
+			catch (const std::exception &exc) {
+				// Exception output
+				std::cout << "Exception when application_clear: " << exc.what() << std::endl;
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ namespace HttpServer`
`313`	`313`	`app->application_final(root.data() );`
`314`	`314`	`}`
`315`	`315`	`}`
`316`		`- catch (std::exception &exc) {`
	`316`	`+ catch (const std::exception &exc) {`
`317`	`317`	`std::cout << "Warning: an exception was thrown when the application '"`
`318`	`318`	`<< app->server_module << "' was finishes: " << exc.what() << std::endl;`
`319`	`319`	`}`
`@@ -460,7 +460,7 @@ namespace HttpServer`
`460`	`460`	`app->application_init(root.data() );`
`461`	`461`	`}`
`462`	`462`	`}`
`463`		`- catch (std::exception &exc) {`
	`463`	`+ catch (const std::exception &exc) {`
`464`	`464`	`std::cout << "Warning: an exception was thrown when the application '" << module_name << "' was initialized: " << exc.what() << std::endl;`
`465`	`465`	`}`
`466`	`466`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,13 @@ namespace HttpServer`
`34`	`34`
`35`	`35`	`for (auto &app : applications)`
`36`	`36`	`{`
`37`		`- try`
`38`		`- {`
	`37`	`+ try {`
`39`	`38`	`if (app->application_final) {`
`40`	`39`	`const std::string root = app->root_dir;`
`41`	`40`	`app->application_final(root.data() );`
`42`	`41`	`}`
`43`	`42`	`}`
`44`		`- catch (std::exception &exc)`
`45`		`- {`
	`43`	`+ catch (const std::exception &exc) {`
`46`	`44`	`std::cout << "Warning: an exception was thrown when the application '" << app->server_module << "' was finishes: " << exc.what() << std::endl;`
`47`	`45`	`}`
`48`	`46`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ namespace HttpServer`
`283`	`283`	`success = app_init(root.data() );`
`284`	`284`	`}`
`285`	`285`	`}`
`286`		`- catch (std::exception &exc) {`
	`286`	`+ catch (const std::exception &exc) {`
`287`	`287`	`std::cout << "Warning: an exception was thrown when the application '" << it_module->second << "' was initialized: " << exc.what() << std::endl;`
`288`	`288`	`success = false;`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`#include "ServerProtocol.h"`
`3`	`3`	`#include "../../utils/Utils.h"`
`4`	`4`
	`5`	`+#include <iostream>`
	`6`	`+`
`5`	`7`	`namespace HttpServer`
`6`	`8`	`{`
`7`	`9`	`ServerProtocol::ServerProtocol(`
`@@ -167,8 +169,9 @@ namespace HttpServer`
`167`	`169`	`// Launch application`
`168`	`170`	`req.app_exit_code = appSets.application_call(&request, &response);`
`169`	`171`	`}`
`170`		`- catch (std::exception &exc) {`
`171`		`- // TODO: exception output`
	`172`	`+ catch (const std::exception &exc) {`
	`173`	`+ // Exception output`
	`174`	`+ std::cout << "Exception when application_call: " << exc.what() << std::endl;`
`172`	`175`	`}`
`173`	`176`
`174`	`177`	`if (response.response_data && response.data_size)`
`@@ -181,8 +184,9 @@ namespace HttpServer`
`181`	`184`	`try {`
`182`	`185`	`appSets.application_clear(response.response_data, response.data_size);`
`183`	`186`	`}`
`184`		`- catch (std::exception &exc) {`
`185`		`- // TODO: exception output`
	`187`	`+ catch (const std::exception &exc) {`
	`188`	`+ // Exception output`
	`189`	`+ std::cout << "Exception when application_clear: " << exc.what() << std::endl;`
`186`	`190`	`}`
`187`	`191`	`}`
`188`	`192`	`}`