Author: soliton
Date: Sun Nov 4 19:35:52 2007
New Revision: 21491
URL: http://svn.gna.org/viewcvs/wesnoth?rev=21491&view=rev
Log:
* throw and catch errors correctly now (hopefully)
Modified:
branches/1.2/src/server/server.cpp
Modified: branches/1.2/src/server/server.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.2/src/server/server.cpp?rev=21491&r1=21490&r2=21491&view=diff
==============================================================================
--- branches/1.2/src/server/server.cpp (original)
+++ branches/1.2/src/server/server.cpp Sun Nov 4 19:35:52 2007
@@ -350,7 +350,7 @@
if(!e.socket) {
// "Could not send initial handshake" really
fatal?
ERR_SERVER << "fatal network error: " <<
e.message << "\n";
- throw e;
+ throw;
break;
} else {
LOG_SERVER << "socket closed: " << e.message <<
"\n";
@@ -1512,8 +1512,12 @@
try {
server(port, input, config_file, nthreads).run();
} catch(network::error& e) {
- ERR_SERVER << "caught network error while server was running.
aborting.: " << e.message << "\n";
+ ERR_SERVER << "Caught network error while server was running.
Aborting.: "
+ << e.message << "\n";
return -1;
+ } catch(...) {
+ ERR_SERVER << "Caught unknown error while server was running.
Aborting.\n";
+ return -1;
}
return 0;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
