libtransport.git Changeset - f9a49506a1d0

Changeset - f9a49506a1d0

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Jan Kaluza - 13 years ago 2012-08-29 10:39:58
hanzz.k@gmail.com

Starting/stopping instances from web-interface

4 files changed with 35 insertions and 1 deletions:

spectrum_manager/src/main.cpp

spectrum_manager/src/methods.cpp

spectrum_manager/src/server.cpp

spectrum_manager/src/server.h

0 comments (0 inline, 0 general)

spectrum_manager/src/main.cpp

➞

Show inline comments

@@ @@ -185,7 +185,7 @@ int main(int argc, char **argv) @@
 			elapsed = 1000000.0 * (td_end.tv_sec -td_start.tv_sec); \
 			elapsed += (td_end.tv_usec - td_start.tv_usec); \
 			elapsed = elapsed / 1000 / 1000; \
 			std::cout << "Response received after " << (elapsed) << " seconds\n";
+// 			std::cout << "Response received after " << (elapsed) << " seconds\n";
+		}
+	}
+}

spectrum_manager/src/methods.cpp

➞

Show inline comments

 					int pid = isRunning(CONFIG_STRING(&vhostCfg, "service.pidfile"));
 					if (pid == 0) {
 						response = "Starting " + itr->path().string() + ": OK\n";
 						std::cout << "Starting " << itr->path() << ": OK\n";
 						exec_(spectrum2_binary, itr->path().string(), vhost);
+					}
 					else {
 						response = "Starting " + itr->path().string() + ": Already started (PID=" + boost::lexical_cast<std::string>(pid) + ")\n";
 						std::cout << "Starting " << itr->path() << ": Already started (PID=" << pid << ")\n";
+					}
+				}
 					int pid = isRunning(CONFIG_STRING(&vhostCfg, "service.pidfile"));
 					if (pid) {
 						response ="Stopping " + itr->path().string() + ": ";
 						std::cout << "Stopping " << itr->path() << ": ";
 						kill(pid, SIGTERM);
 							count--;
+						}
 						if (count == 0) {
 							response += "ERROR (timeout)\n";
 							std::cout << " ERROR (timeout)\n";
+						}
 						else {
 							response += "OK\n";
 							std::cout << " OK\n";
+						}
+					}
 					else {
 						response = "Stopping " + itr->path().string() + ": Not running\n";
 						std::cout << "Stopping " << itr->path() << ": Not running\n";
+					}
+				}

spectrum_manager/src/server.cpp

➞

Show inline comments

 	print_html(conn, request_info, html);
+}
 void Server::serve_start(struct mg_connection *conn, const struct mg_request_info *request_info) {
 	std::string html= get_header() ;
 	char jid[255];
 	get_qsvar(request_info, "jid", jid, sizeof(jid));
 	start_instances(m_config, jid);
 	html += "<b>" + get_response() + "</b>";
 	html += "</body></html>";
 	print_html(conn, request_info, html);
+}
 void Server::serve_stop(struct mg_connection *conn, const struct mg_request_info *request_info) {
 	std::string html= get_header();
 	char jid[255];
 	get_qsvar(request_info, "jid", jid, sizeof(jid));
 	stop_instances(m_config, jid);
 	html += "<b>" + get_response() + "</b>";
 	html += "</body></html>";
 	print_html(conn, request_info, html);
+}
 void Server::serve_root(struct mg_connection *conn, const struct mg_request_info *request_info) {
 	std::vector<std::string> list = show_list(m_config, false);
 	std::string html= get_header() + "<h2>List of instances</h2><table><tr><th>JID<th>Status</th><th>Command</th></tr>";
 			serve_login(conn, request_info);
 		} else if (strcmp(request_info->uri, "/") == 0) {
 			serve_root(conn, request_info);
 		} else if (strcmp(request_info->uri, "/start") == 0) {
 			serve_start(conn, request_info);
 		} else if (strcmp(request_info->uri, "/stop") == 0) {
 			serve_stop(conn, request_info);
 		} else {
 			// No suitable handler found, mark as not processed. Mongoose will
 			// try to serve the request.

spectrum_manager/src/server.h

➞

Show inline comments

@@ @@ -53,6 +53,8 @@ class Server { @@
 	private:
 		void serve_login(struct mg_connection *conn, const struct mg_request_info *request_info);
 		void serve_root(struct mg_connection *conn, const struct mg_request_info *request_info);
 		void serve_start(struct mg_connection *conn, const struct mg_request_info *request_info);
 		void serve_stop(struct mg_connection *conn, const struct mg_request_info *request_info);
 		void print_html(struct mg_connection *conn, const struct mg_request_info *request_info, const std::string &html);
 	private:

0 comments (0 inline, 0 general)