libtransport.git Changeset - c83794bb382a

Changeset - c83794bb382a

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 13 years ago 2012-08-01 17:03:59
hanzz.k@gmail.com

spectrum2_manager can start/stop particular instances

1 file changed with 21 insertions and 4 deletions:

spectrum_manager/src/main.cpp

0 comments (0 inline, 0 general)

spectrum_manager/src/main.cpp

➞

Show inline comments

@@ @@ -115,13 +115,13 @@ static int isRunning(const std::string &pidfile) { @@
 	if (kill(boost::lexical_cast<int>(pid), 0) != 0)
 		return 0;
 	return boost::lexical_cast<int>(pid);
+}
-static void start_all_instances(ManagerConfig *config) {
+static void start_instances(ManagerConfig *config, const std::string &_jid = "") {
 	path p(CONFIG_STRING(config, "service.config_directory"));
 	try {
 		if (!exists(p)) {
 			std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
 			exit(6);
@@ @@ -157,12 +157,16 @@ static void start_all_instances(ManagerConfig *config) { @@
 					Config vhostCfg;
 					if (vhostCfg.load(itr->path().string(), vhost) == false) {
 						std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
 						continue;
+					}
 					if (!_jid.empty() && _jid != vhost) {
 						continue;
+					}
 					int pid = isRunning(CONFIG_STRING(&vhostCfg, "service.pidfile"));
 					if (pid == 0) {
 						std::cout << "Starting " << itr->path() << ": OK\n";
 						exec_(spectrum2_binary, itr->path().string(), vhost);
+					}
 					else {
@@ @@ -175,13 +179,13 @@ static void start_all_instances(ManagerConfig *config) { @@
 	catch (const filesystem_error& ex) {
 		std::cerr << "boost filesystem error\n";
 		exit(5);
+	}
+}
-static void stop_all_instances(ManagerConfig *config) {
+static void stop_instances(ManagerConfig *config, const std::string &_jid = "") {
 	path p(CONFIG_STRING(config, "service.config_directory"));
 	try {
 		if (!exists(p)) {
 			std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
 			exit(6);
@@ @@ -209,12 +213,16 @@ static void stop_all_instances(ManagerConfig *config) { @@
 					Config vhostCfg;
 					if (vhostCfg.load(itr->path().string(), vhost) == false) {
 						std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
 						continue;
+					}
 					if (!_jid.empty() && _jid != vhost) {
 						continue;
+					}
 					int pid = isRunning(CONFIG_STRING(&vhostCfg, "service.pidfile"));
 					if (pid) {
 						std::cout << "Stopping " << itr->path() << ": OK\n";
 						kill(pid, SIGTERM);
+					}
 					else {
@@ @@ -544,16 +552,16 @@ int main(int argc, char **argv) @@
 	if (command.empty()) {
 		std::cout << desc << "\n";
 		return 1;
+	}
 	if (command[0] == "start") {
-		start_all_instances(&config);
+		start_instances(&config);
+	}
 	else if (command[0] == "stop") {
-		stop_all_instances(&config);
+		stop_instances(&config);
+	}
 	else if (command[0] == "status") {
 		return show_status(&config);
+	}
 	else if (command[0] == "list") {
 		show_list(&config);
@@ @@ -567,12 +575,21 @@ int main(int argc, char **argv) @@
 		Swift::BoostNetworkFactories networkFactories(&eventLoop);
 		std::string jid = command[0];
 		command.erase(command.begin());
 		std::string cmd = boost::algorithm::join(command, " ");
 		if (cmd == "start") {
 			start_instances(&config, jid);
 			return 0;
+		}
 		else if (cmd == "stop") {
 			stop_instances(&config, jid);
 			return 0;
+		}
 		ask_local_server(&config, networkFactories, jid, cmd);
 // 		std::string message = command;
 // 		m = &message;
 // 		ask_local_server(&config, networkFactories, message);

0 comments (0 inline, 0 general)