Merge pull request etr#83 from 4picht/patch-no-abort

etr · etr · commit aafbf4d0cc0b · 2015-10-03T04:34:34.000+01:00
Do not call abort, throw an exception instead
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -41,6 +41,7 @@
 #include <deque>
 
 #include <pthread.h>
+#include <stdexcept>
 
 #include "httpserver/create_webserver.hpp"
 
@@ -66,6 +67,15 @@ namespace details {
     class comet_manager;
 }
 
+class webserver_exception : public std::runtime_error
+{
+public:
+	webserver_exception()
+	: std::runtime_error("httpserver runtime error")
+	{
+	}
+};
+
 /**
  * Class representing the webserver. Main class of the apis.
 **/
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -280,7 +280,7 @@ void* webserver::select(void* self)
         FD_ZERO (&ws);
         FD_ZERO (&es);
         if (MHD_YES != MHD_get_fdset (di->daemon, &rs, &ws, &es, &max))
-            abort(); /* fatal internal error */
+            throw ::httpserver::webserver_exception(); /* fatal internal error */
 
         unsigned long long timeout_microsecs = 0;
         unsigned long long timeout_secs = 0;
@@ -563,7 +563,7 @@ bool webserver::start(bool blocking)
             {
                 cout << gettext("Unable to connect daemon to port: ") <<
                     this->port << endl;
-                abort();
+                throw ::httpserver::webserver_exception();
             }
             details::daemon_item* di = new details::daemon_item(this, daemon);
             daemons.push_back(di);
@@ -579,7 +579,7 @@ bool webserver::start(bool blocking)
                     static_cast<void*>(di)
             ))
             {
-                abort();
+                throw ::httpserver::webserver_exception();
             }
         }
     }
@@ -595,7 +595,7 @@ bool webserver::start(bool blocking)
         {
             cout << gettext("Unable to connect daemon to port: ") <<
                 this->port << endl;
-            abort();
+            throw ::httpserver::webserver_exception();
         }
         details::daemon_item* di = new details::daemon_item(this, daemon);
         daemons.push_back(di);

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ void* webserver::select(void* self)`
`280`	`280`	`FD_ZERO (&ws);`
`281`	`281`	`FD_ZERO (&es);`
`282`	`282`	`if (MHD_YES != MHD_get_fdset (di->daemon, &rs, &ws, &es, &max))`
`283`		`- abort(); /* fatal internal error */`
	`283`	`+ throw ::httpserver::webserver_exception(); /* fatal internal error */`
`284`	`284`
`285`	`285`	`unsigned long long timeout_microsecs = 0;`
`286`	`286`	`unsigned long long timeout_secs = 0;`
`@@ -563,7 +563,7 @@ bool webserver::start(bool blocking)`
`563`	`563`	`{`
`564`	`564`	`cout << gettext("Unable to connect daemon to port: ") <<`
`565`	`565`	`this->port << endl;`
`566`		`- abort();`
	`566`	`+ throw ::httpserver::webserver_exception();`
`567`	`567`	`}`
`568`	`568`	`details::daemon_item* di = new details::daemon_item(this, daemon);`
`569`	`569`	`daemons.push_back(di);`
`@@ -579,7 +579,7 @@ bool webserver::start(bool blocking)`
`579`	`579`	`static_cast<void*>(di)`
`580`	`580`	`))`
`581`	`581`	`{`
`582`		`- abort();`
	`582`	`+ throw ::httpserver::webserver_exception();`
`583`	`583`	`}`
`584`	`584`	`}`
`585`	`585`	`}`
`@@ -595,7 +595,7 @@ bool webserver::start(bool blocking)`
`595`	`595`	`{`
`596`	`596`	`cout << gettext("Unable to connect daemon to port: ") <<`
`597`	`597`	`this->port << endl;`
`598`		`- abort();`
	`598`	`+ throw ::httpserver::webserver_exception();`
`599`	`599`	`}`
`600`	`600`	`details::daemon_item* di = new details::daemon_item(this, daemon);`
`601`	`601`	`daemons.push_back(di);`