Removed internal exception in favor of standard one

etr · etr · commit 2076fbada3f2 · 2018-12-31T03:11:40.000Z
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
@@ -65,15 +65,6 @@ 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
@@ -296,8 +296,7 @@ bool webserver::start(bool blocking)
         iov.push_back(gen(MHD_OPTION_LISTEN_SOCKET, bind_socket));
     if(start_method == http_utils::THREAD_PER_CONNECTION && max_threads != 0)
     {
-        cout << "Cannot specify maximum number of threads when using a thread per connection" << endl;
-        throw ::httpserver::webserver_exception();
+        throw std::invalid_argument("Cannot specify maximum number of threads when using a thread per connection");
     }
 
     if(max_threads != 0)
@@ -381,9 +380,7 @@ bool webserver::start(bool blocking)
 
     if(NULL == daemon)
     {
-        cout << gettext("Unable to connect daemon to port: ") <<
-            this->port << endl;
-        throw ::httpserver::webserver_exception();
+        throw std::invalid_argument("Unable to connect daemon to port: " + this->port);
     }
     details::daemon_item* di = new details::daemon_item(this, daemon);
     daemons.push_back(di);

Original file line number	Diff line number	Diff line change
`@@ -296,8 +296,7 @@ bool webserver::start(bool blocking)`
`296`	`296`	`iov.push_back(gen(MHD_OPTION_LISTEN_SOCKET, bind_socket));`
`297`	`297`	`if(start_method == http_utils::THREAD_PER_CONNECTION && max_threads != 0)`
`298`	`298`	`{`
`299`		`- cout << "Cannot specify maximum number of threads when using a thread per connection" << endl;`
`300`		`- throw ::httpserver::webserver_exception();`
	`299`	`+ throw std::invalid_argument("Cannot specify maximum number of threads when using a thread per connection");`
`301`	`300`	`}`
`302`	`301`
`303`	`302`	`if(max_threads != 0)`
`@@ -381,9 +380,7 @@ bool webserver::start(bool blocking)`
`381`	`380`
`382`	`381`	`if(NULL == daemon)`
`383`	`382`	`{`
`384`		`- cout << gettext("Unable to connect daemon to port: ") <<`
`385`		`- this->port << endl;`
`386`		`- throw ::httpserver::webserver_exception();`
	`383`	`+ throw std::invalid_argument("Unable to connect daemon to port: " + this->port);`
`387`	`384`	`}`
`388`	`385`	`details::daemon_item* di = new details::daemon_item(this, daemon);`
`389`	`386`	`daemons.push_back(di);`