[Wesnoth-commits] r21490 - /trunk/src/server/server.cpp

[Soliton]

Author: soliton
Date: Sun Nov  4 19:33:57 2007
New Revision: 21490

URL: http://svn.gna.org/viewcvs/wesnoth?rev=21490&view=rev
Log:
* throw and catch errors correctly now (hopefully)

Modified:
    trunk/src/server/server.cpp

Modified: trunk/src/server/server.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/server/server.cpp?rev=21490&r1=21489&r2=21490&view=diff
==============================================================================
--- trunk/src/server/server.cpp (original)
+++ trunk/src/server/server.cpp Sun Nov  4 19:33:57 2007
@@ -367,7 +367,7 @@
                        if (!e.socket) {
                                // "Could not send initial handshake" really 
fatal?
                                ERR_SERVER << "fatal network error: " << 
e.message << "\n";
-                               throw e;
+                               throw;
                                break;
                        }
                        DBG_SERVER << "socket closed: " << e.message << "\n";
@@ -1503,9 +1503,12 @@
        try {
                server(port, input, config_file, min_threads, 
max_threads).run();
        } catch(network::error& e) {
-               ERR_SERVER << "caught network error while server was running. 
aborting.: "
+               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
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits