Skip to content

Do not call abort, throw an exception instead #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2015
Merged

Do not call abort, throw an exception instead #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/httpserver/webserver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <deque>

#include <pthread.h>
#include <stdexcept>

#include "httpserver/create_webserver.hpp"

Expand All @@ -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.
**/
Expand Down
8 changes: 4 additions & 4 deletions src/webserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -579,7 +579,7 @@ bool webserver::start(bool blocking)
static_cast<void*>(di)
))
{
abort();
throw ::httpserver::webserver_exception();
}
}
}
Expand All @@ -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);
Expand Down