libtransport.git Changeset - 140278d70d9d

Changeset - 140278d70d9d

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-10-27 00:07:59
hanzz.k@gmail.com

Proper default config file

1 file changed with 1 insertions and 1 deletions:

spectrum_manager/src/main.cpp

0 comments (0 inline, 0 general)

spectrum_manager/src/main.cpp

➞

Show inline comments

@@ @@ -170,97 +170,97 @@ static void stop_all_instances(ManagerConfig *config) { @@
 	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);
+		}
 		if (!is_directory(p)) {
 			std::cerr << "Config directory " << CONFIG_STRING(config, "service.config_directory") << " does not exist\n";
 			exit(7);
+		}
 		directory_iterator end_itr;
 		for (directory_iterator itr(p); itr != end_itr; ++itr) {
 			if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
 				Config cfg;
 				if (cfg.load(itr->path().string()) == false) {
 					std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+				}
 				int pid = isRunning(CONFIG_STRING(&cfg, "service.pidfile"));
 				if (pid) {
 					std::cout << "Stopping " << itr->path() << ": OK\n";
 					kill(pid, SIGTERM);
+				}
 				else {
 					std::cout << "Stopping " << itr->path() << ": Not running\n";
+				}
+			}
+		}
+	}
 	catch (const filesystem_error& ex) {
 		std::cerr << "boost filesystem error\n";
 		exit(5);
+	}
+}
 int main(int argc, char **argv)
+{
 	ManagerConfig config;
 	std::string config_file;
 	std::string command;
 	boost::program_options::variables_map vm;
 	boost::program_options::options_description desc("Usage: spectrum [OPTIONS] <COMMAND>\nAllowed options");
 	desc.add_options()
 		("help,h", "Show help output")
-		("config,c", boost::program_options::value<std::string>(&config_file)->default_value("/etc/spectrum2/spectrum-manager.cfg"), "Spectrum manager config file")
+		("config,c", boost::program_options::value<std::string>(&config_file)->default_value("/etc/spectrum2/spectrum_manager.cfg"), "Spectrum manager config file")
 		("command", boost::program_options::value<std::string>(&command)->default_value(""), "Command")
+		;
 	try
+	{
 		boost::program_options::positional_options_description p;
 		p.add("command", -1);
 		boost::program_options::store(boost::program_options::command_line_parser(argc, argv).
           options(desc).positional(p).run(), vm);
 		boost::program_options::notify(vm);
 		if(vm.count("help"))
+		{
 			std::cout << desc << "\n";
 			return 1;
+		}
+	}
 	catch (std::runtime_error& e)
+	{
 		std::cout << desc << "\n";
 		return 2;
+	}
 	catch (...)
+	{
 		std::cout << desc << "\n";
 		return 3;
+	}
 	if (!config.load(config_file)) {
 		std::cerr << "Can't load configuration file.\n";
 		return 4;
+	}
 	if (command == "start") {
 		start_all_instances(&config);
+	}
 	else if (command == "stop") {
 		stop_all_instances(&config);
+	}
 	else {
 		Swift::SimpleEventLoop eventLoop;
 		Swift::BoostNetworkFactories networkFactories(&eventLoop);
 		std::string message = argv[1];
 		m = &message;
 		std::vector<std::string> servers = CONFIG_VECTOR(&config, "servers.server");
 		for (std::vector<std::string>::const_iterator it = servers.begin(); it != servers.end(); it++) {

0 comments (0 inline, 0 general)