X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/dd5a5045d5549015b6500726098cb43d1e1c614c..ea73629e106c1ba77bcd09feac7e22035f28b7d7:/Server/tests/server_test.cpp?ds=sidebyside

diff --git a/Server/tests/server_test.cpp b/Server/tests/server_test.cpp
index 3233413..25d01a6 100644
--- a/Server/tests/server_test.cpp
+++ b/Server/tests/server_test.cpp
@@ -27,14 +27,22 @@
 
 #include "plaqui/server/connection.h"
 #include "plaqui/server/server.h"
+#include "plaqui/server/string.h"
 #include <socket++/sockinet.h>
 #include <iostream>
-#include <sstream>
 #include <exception>
 
 using namespace std;
 using namespace PlaQui::Server;
 
+void on_error(const Runnable::Error& code, const string& desc) {
+	cerr << "--------------------------------------------------------" << endl;
+	cerr << "Error en el servidor:" << endl;
+	cerr << "Código: " << code << endl;
+	cerr << "Descripción: " << desc << endl;
+	cerr << "--------------------------------------------------------" << endl;
+}
+
 int main(int argc, char* argv[]) {
 
 	// Termina con mas informacion si hay una excepcion no manejada.
@@ -53,18 +61,17 @@ int main(int argc, char* argv[]) {
 		// Si tiene 2 parámetros.
 		if (argc > 2) {
 			// Obtengo puerto.
-			stringstream ss(argv[1]);
-			ss >> port;
+			to(argv[2], port);
 		}
 	}
 
 	// Inicializa threads.
 	Glib::thread_init();
 
+	Server* server = NULL;
 	try {
-		// Corre el server.
-		Server server(filename, port);
-		server.run(false);
+		// Crea el server (empieza a escuchar).
+		server = new Server(filename, port);
 	} catch (const sockerr& e) {
 		cerr << "Socket Error: " << e.operation() << " | serrno = "
 			<< e.serrno() << " | errstr = " << e.errstr() << endl;
@@ -83,13 +90,26 @@ int main(int argc, char* argv[]) {
 		} else if (e.benign()) {
 			cerr << "Es: recoverable read/write error like EINTR etc." << endl;
 		}
+		return e.serrno();
 	} catch (const exception& e) {
 		cerr << "Error: " << e.what() << endl;
+		return 1;
 	} catch (const char* e) {
 		cerr << "Error: " << e << endl;
+		return 2;
 	} catch (...) {
 		cerr << "Error desconocido!" << endl;
+		return 3;
 	}
 
+	// Conecto señal para atender errores.
+	server->signal_error().connect(SigC::slot(on_error));
+
+	// Corre el server.
+	server->run(false);
+
+	// Como no detachee el server, lo tengo que eliminar a mano.
+	delete server;
+
 	return 0;
 }