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

diff --git a/Server/tests/server_test.cpp b/Server/tests/server_test.cpp
index bdb6190..1f505ee 100644
--- a/Server/tests/server_test.cpp
+++ b/Server/tests/server_test.cpp
@@ -29,12 +29,28 @@
 #include "plaqui/server/server.h"
 #include "plaqui/server/string.h"
 #include <socket++/sockinet.h>
+#include <glibmm/timer.h>
 #include <iostream>
 #include <exception>
 
 using namespace std;
 using namespace PlaQui::Server;
 
+Server* server = NULL;
+
+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;
+}
+
+void on_finished(void) {
+	cerr << "Murió el servidor!" << endl;
+	server = NULL;
+}
+
 int main(int argc, char* argv[]) {
 
 	// Termina con mas informacion si hay una excepcion no manejada.
@@ -61,9 +77,8 @@ int main(int argc, char* argv[]) {
 	Glib::thread_init();
 
 	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;
@@ -82,13 +97,31 @@ 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);
+
+	// Espera a que el server se muera.
+	while (server) {
+		Glib::usleep(1000000);
+	}
+
+	// Como no detachee el server, lo tengo que eliminar a mano.
+	//delete server;
+
 	return 0;
 }