0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added a "shut_down" admin command to shut the server down gracefully

Browse source 
a bit nicer (more useful?) exit codes
This commit is contained in:
Gunter Labes 2007-12-17 01:54:02 +00:00
parent ad657bccb6
commit 6f6033a04b
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/server/server.cpp
View file

@ -34,6 +34,7 @@
#include <algorithm>
#include <cassert>
#include <cerrno>
#include <cstdlib>
#include <ctime>
#include <iostream>
@ -369,6 +370,10 @@ void server::run() {
} catch(config::error& e) {
WRN_CONFIG << "Warning: error in received data: " << e.message << "\n";
} catch(network::error& e) {
if (e.message == "shut down") {
std::cout << "Shutting server down.\n";
break;
}
if (!e.socket) {
ERR_SERVER << "network error: " << e.message << "\n";
e.disconnect();
@ -655,6 +660,9 @@ std::string server::process_command(const std::string& query) {
const std::string command(query.begin(),i);
std::string parameters = (i == query.end() ? "" : std::string(i+1,query.end()));
utils::strip(parameters);
if (command == "shut_down") {
throw network::error("shut down");
}
if (command == "msg" || command == "lobbymsg") {
if (parameters == "") {
return "You must type a message.";
@ -1448,10 +1456,12 @@ int main(int argc, char** argv) {
} catch(network::error& e) {
ERR_SERVER << "Caught network error while server was running. Aborting.: "
<< e.message << "\n";
return -1;
//! @todo errno should be passed here with the error or it might not be
//! the true errno anymore. Seems to work good enough for now though.
return errno;
} catch(std::bad_alloc&) {
ERR_SERVER << "Ran out of memory. Aborting.\n";
return -1;
return ENOMEM;
} catch(...) {
ERR_SERVER << "Caught unknown error while server was running. Aborting.\n";
return -1;