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

diff --git a/Server/tests/server_test.cpp b/Server/tests/server_test.cpp
index e0753b9..1f505ee 100644
--- a/Server/tests/server_test.cpp
+++ b/Server/tests/server_test.cpp
@@ -25,37 +25,103 @@
 // $Id$
 //
 
-#include "server.h"
+#include "plaqui/server/connection.h"
+#include "plaqui/server/server.h"
+#include "plaqui/server/string.h"
 #include <socket++/sockinet.h>
+#include <glibmm/timer.h>
 #include <iostream>
-#include <sstream>
 #include <exception>
 
 using namespace std;
-using namespace Plaqui;
+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.
-	std::set_terminate (__gnu_cxx::__verbose_terminate_handler);
+	set_terminate (__gnu_cxx::__verbose_terminate_handler);
 
-	// Necesita argumentos.
-	if (argc != 2) {
-		cerr << "Faltan argumentos: " << endl;
-		cerr << "\t" << argv[0] << " port" << endl;
-		return 1;
+	// Bienvenida.
+	cout << "PlaQui Server. Modo de uso: " << endl;
+	cout << "\t" << argv[0] << " [planta] [puerto]" << endl;
+
+	// Acepta argumentos.
+	string filename = "prueba.xml";
+	Connection::Port port = 7522;
+	if (argc > 1) {
+		// Obtengo nombre del archivo de la planta.
+		filename = argv[1];
+		// Si tiene 2 parámetros.
+		if (argc > 2) {
+			// Obtengo puerto.
+			to(argv[2], port);
+		}
 	}
 
-	// Obtengo puerto.
-	unsigned port;
-	{
-		stringstream str(argv[1]);
-		str >> port;
+	// Inicializa threads.
+	Glib::thread_init();
+
+	try {
+		// 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;
+		if (e.io()) {
+			cerr << "Es: non-blocking and interrupt io recoverable error."
+				<< endl;
+		} else if (e.arg()) {
+			cerr <<  "Es: incorrect argument supplied. recoverable error."
+				<< endl;
+		} else if (e.op()) {
+			cerr << "Es: operational error. recovery difficult." << endl;
+		} else if (e.conn()) {
+			cerr << "Es: connection error." << endl;
+		} else if (e.addr()) {
+			cerr << "Es: address error." << endl;
+		} 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 server(port);
-	server.run(false);
+	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;
 }