libtransport.git Changeset - 14e450f7b5a8

Changeset - 14e450f7b5a8

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Jan Kaluza - 13 years ago 2012-09-04 16:07:32
hanzz.k@gmail.com

Do not create pidfile and portfile directories on windows

1 file changed with 8 insertions and 6 deletions:

spectrum/src/main.cpp

0 comments (0 inline, 0 general)

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -224,74 +224,76 @@ int main(int argc, char **argv) @@
 				return 1;
+			}
+		}
 #endif
+	}
 	catch (std::runtime_error& e)
+	{
 		std::cout << desc << "\n";
 		return 1;
+	}
 	catch (...)
+	{
 		std::cout << desc << "\n";
 		return 1;
+	}
 	if (!config.load(vm["config"].as<std::string>(), jid)) {
 		std::cerr << "Can't load configuration file.\n";
 		return 1;
+	}
 	// create directories
 	try {
 		boost::filesystem::create_directories(
 			boost::filesystem::path(CONFIG_STRING(&config, "service.pidfile")).parent_path().string()
 		);
 		boost::filesystem::create_directories(CONFIG_STRING(&config, "service.working_dir"));
+	}
 	catch (...) {
-		std::cerr << "Can't create service.pidfile directory " << boost::filesystem::path(CONFIG_STRING(&config, "service.pidfile")).parent_path().string() << ".\n";
+		std::cerr << "Can't create service.working_dir directory " << CONFIG_STRING(&config, "service.working_dir") << ".\n";
 		return 1;
+	}
 #ifndef WIN32
 	// create directories
 	try {
 		boost::filesystem::create_directories(CONFIG_STRING(&config, "service.working_dir"));
 		boost::filesystem::create_directories(
 			boost::filesystem::path(CONFIG_STRING(&config, "service.pidfile")).parent_path().string()
 		);
+	}
 	catch (...) {
-		std::cerr << "Can't create service.working_dir directory " << CONFIG_STRING(&config, "service.working_dir") << ".\n";
+		std::cerr << "Can't create service.pidfile directory " << boost::filesystem::path(CONFIG_STRING(&config, "service.pidfile")).parent_path().string() << ".\n";
 		return 1;
+	}
 	// create directories
 	try {
 		boost::filesystem::create_directories(
 			boost::filesystem::path(CONFIG_STRING(&config, "service.portfile")).parent_path().string()
 		);
+	}
 	catch (...) {
 		std::cerr << "Can't create service.portfile directory " << CONFIG_STRING(&config, "service.portfile") << ".\n";
 		return 1;
+	}
 #endif
 #ifdef WIN32
 	SetCurrentDirectory( utf8ToUtf16(CONFIG_STRING(&config, "service.working_dir")).c_str() );
 #endif
 #ifndef WIN32
 	if (!CONFIG_STRING(&config, "service.group").empty() ||!CONFIG_STRING(&config, "service.user").empty() ) {
 		struct group *gr;
 		if ((gr = getgrnam(CONFIG_STRING(&config, "service.group").c_str())) == NULL) {
 			std::cerr << "Invalid service.group name " << CONFIG_STRING(&config, "service.group") << "\n";
 			return 1;
+		}
 		struct passwd *pw;
 		if ((pw = getpwnam(CONFIG_STRING(&config, "service.user").c_str())) == NULL) {
 			std::cerr << "Invalid service.user name " << CONFIG_STRING(&config, "service.user") << "\n";
 			return 1;
+		}
 		chown(CONFIG_STRING(&config, "service.working_dir").c_str(), pw->pw_uid, gr->gr_gid);
+	}
 	char backendport[20];
 	FILE* port_file_f;
 	port_file_f = fopen(CONFIG_STRING(&config, "service.portfile").c_str(), "w+");
 	if (port_file_f == NULL) {

0 comments (0 inline, 0 general)