- Se agrega la posibilidad de pausar una planta.

[z.facultad/75.42/plaqui.git] / Server / src / server.cpp

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index e332866d37954f4b22da97a9dbb3b3c1ae976d41..fac84190fd31f51a2b90667ccd0a93028b56b5de 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -73,10 +73,9 @@ Server::Server(const string& plant_filename, const Connection::Port& port)
        // FIXME - hacer que se puedan cargar mas plantas bien.
        Glib::Mutex::Lock lock(plants_mutex);
        plants["default"] = new Plant(plant_filename);
        // FIXME - hacer que se puedan cargar mas plantas bien.
        Glib::Mutex::Lock lock(plants_mutex);
        plants["default"] = new Plant(plant_filename);

-       plants["default"]->signal_finished().connect(
-                       SigC::bind<const char*>(
-                               SigC::slot_class(*this, &Server::on_plant_finished),
-                               "default"));
+       plants["default"]->signal_finished().connect(SigC::bind(
+                       SigC::slot_class(*this, &Server::on_plant_finished),
+                       "default"));

        plants["default"]->run();
 }
 
        plants["default"]->run();
 }
 


@@ -88,10 +87,9 @@ Connection* Server::new_connection(const sockbuf::sockdesc& sd) {
 #endif // DEBUG
        ControlServer* connection = new ControlServer(sd);
        // TODO verificar si el new se hace bien? no creo.
 #endif // DEBUG
        ControlServer* connection = new ControlServer(sd);
        // TODO verificar si el new se hace bien? no creo.

-       connection->signal_command_received().connect(
-                       SigC::bind<ControlServer*>(
-                               SigC::slot_class(*this, &Server::on_control_command_received),
-                               connection));
+       connection->signal_command_received().connect(SigC::bind(
+                       SigC::slot_class(*this, &Server::on_control_command_received),
+                       connection));

        // TODO: 
        return connection;
 }
        // TODO: 
        return connection;
 }


@@ -121,22 +119,15 @@ void Server::on_control_command_received(const Command& command,
                if (command.get_command() == "status") {
                        response = cmd_server_status();
                } else if (command.get_command() == "stop") {
                if (command.get_command() == "status") {
                        response = cmd_server_status();
                } else if (command.get_command() == "stop") {

-                       finish();

                        response = new HTTPResponse(HTTPMessage::OK,
                                        "<response desc=\"El server se apagará en instantes...\" />");
                        response = new HTTPResponse(HTTPMessage::OK,
                                        "<response desc=\"El server se apagará en instantes...\" />");

-                       response->headers["Content-Type"] = "text/xml; charset=iso-8859-1";
-                       controlserver->send(*response);
-                       delete response;
-                       // Creo una conexión suicida para que el accept() del server retorne
-                       // el control y el server pueda terminar realmente.
-                       try {
-                               sockinetbuf suicida(sockbuf::sock_stream);
-                               suicida.connect(socket.localhost(), socket.localport());
-                       } catch (...) {
-                               // FIXME
-                               signal_error().emit(12345, "ahhhh! no puedo crear conexion suicida");
-                       }
-                       return;
+                       // XXX - Sin mandar la respuesta enseguida podría ser que el server
+                       // cierre la conexión antes de mandar la respuesta.
+                       //response->headers["Content-Type"] = "text/xml; charset=iso-8859-1";
+                       //controlserver->send(*response);
+                       //delete response;
+                       finish();
+                       //return;

                } else {
                        response = new HTTPResponse(HTTPMessage::NOT_FOUND,
                                        "<response desc=\"Invalid command for 'server' taget!\" />");
                } else {
                        response = new HTTPResponse(HTTPMessage::NOT_FOUND,
                                        "<response desc=\"Invalid command for 'server' taget!\" />");


@@ -168,6 +159,10 @@ void Server::on_control_command_received(const Command& command,
                        response = cmd_plant_get(command);
                } else if (command.get_command() == "set") {
                        response = cmd_plant_set(command);
                        response = cmd_plant_get(command);
                } else if (command.get_command() == "set") {
                        response = cmd_plant_set(command);

+               } else if (command.get_command() == "set_frequency") {
+                       response = cmd_plant_set_frequency(command);
+               } else if (command.get_command() == "start") {
+                       response = cmd_plant_start(command);

                } else if (command.get_command() == "stop") {
                        response = cmd_plant_stop(command);
                } else {
                } else if (command.get_command() == "stop") {
                        response = cmd_plant_stop(command);
                } else {


@@ -377,6 +372,40 @@ HTTPResponse* Server::cmd_plant_set(const Command& command) {
                        string("<response desc=\"Se cambió el estado del elemento '") + element + "'.\" />");
 }
 
                        string("<response desc=\"Se cambió el estado del elemento '") + element + "'.\" />");
 }
 

+HTTPResponse* Server::cmd_plant_set_frequency(const Command& command) {
+       if (command.get_args().size() < 2) {
+               return new HTTPResponse(HTTPMessage::CONFLICT,
+                               "<response desc=\"Faltan argumentos.\" />");
+       }
+       Glib::Mutex::Lock lock(plants_mutex);
+       const string name = command.get_args()[0];
+       if (plants.find(name) == plants.end()) {
+               return new HTTPResponse(HTTPMessage::NOT_FOUND,
+                               string("<response desc=\"No existe la planta ") + name + "\" />");
+       }
+       unsigned hz;
+       to(command.get_args()[1], hz);
+       plants[name]->set_frequency(hz);
+       return new HTTPResponse(HTTPMessage::OK,
+                       string("<response desc=\"La planta '") + name + "' fue pausada.\" />");
+}
+
+HTTPResponse* Server::cmd_plant_start(const Command& command) {
+       if (!command.get_args().size()) {
+               return new HTTPResponse(HTTPMessage::CONFLICT,
+                               "<response desc=\"Faltan argumentos.\" />");
+       }
+       Glib::Mutex::Lock lock(plants_mutex);
+       const string name = command.get_args()[0];
+       if (plants.find(name) == plants.end()) {
+               return new HTTPResponse(HTTPMessage::NOT_FOUND,
+                               string("<response desc=\"No existe la planta ") + name + "\" />");
+       }
+       plants[name]->set_paused(false);
+       return new HTTPResponse(HTTPMessage::OK,
+                       string("<response desc=\"La planta '") + name + "' fue reanudada.\" />");
+}
+

 HTTPResponse* Server::cmd_plant_stop(const Command& command) {
        if (!command.get_args().size()) {
                return new HTTPResponse(HTTPMessage::CONFLICT,
 HTTPResponse* Server::cmd_plant_stop(const Command& command) {
        if (!command.get_args().size()) {
                return new HTTPResponse(HTTPMessage::CONFLICT,


@@ -388,7 +417,22 @@ HTTPResponse* Server::cmd_plant_stop(const Command& command) {
                return new HTTPResponse(HTTPMessage::NOT_FOUND,
                                string("<response desc=\"No existe la planta ") + name + "\" />");
        }
                return new HTTPResponse(HTTPMessage::NOT_FOUND,
                                string("<response desc=\"No existe la planta ") + name + "\" />");
        }

-       // TODO Ver si al frenar la planta se destruye (no deberia!!!)
+       plants[name]->set_paused(true);
+       return new HTTPResponse(HTTPMessage::OK,
+                       string("<response desc=\"La planta '") + name + "' fue pausada.\" />");
+}
+
+HTTPResponse* Server::cmd_plant_remove(const Command& command) {
+       if (!command.get_args().size()) {
+               return new HTTPResponse(HTTPMessage::CONFLICT,
+                               "<response desc=\"Faltan argumentos.\" />");
+       }
+       Glib::Mutex::Lock lock(plants_mutex);
+       const string name = command.get_args()[0];
+       if (plants.find(name) == plants.end()) {
+               return new HTTPResponse(HTTPMessage::NOT_FOUND,
+                               string("<response desc=\"No existe la planta ") + name + "\" />");
+       }

        plants[name]->finish();
        return new HTTPResponse(HTTPMessage::OK,
                        string("<response desc=\"La planta '") + name + "' se cerrará en instantes...\" />");
        plants[name]->finish();
        return new HTTPResponse(HTTPMessage::OK,
                        string("<response desc=\"La planta '") + name + "' se cerrará en instantes...\" />");