libtransport.git Changeset - f18383c3ebd7

Changeset - f18383c3ebd7

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 13 years ago 2013-01-13 10:50:41
hanzz.k@gmail.com

chdir to working_dir also when not running as daemon

1 file changed with 7 insertions and 2 deletions:

spectrum/src/main.cpp

0 comments (0 inline, 0 general)

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -395,13 +395,12 @@ int main(int argc, char **argv) @@
 		std::cerr << "Can't load configuration file.\n";
 		return 1;
+	}
 	// create directories
 	try {
 		Transport::Util::createDirectories(&config, CONFIG_STRING(&config, "service.working_dir"));
+	}
 	catch (...) {
 		std::cerr << "Can't create service.working_dir directory " << CONFIG_STRING(&config, "service.working_dir") << ".\n";
 		return 1;
+	}
@@ @@ -448,13 +447,19 @@ int main(int argc, char **argv) @@
 	fclose(port_file_f);
 	if (!no_daemon) {
 		// daemonize
 		daemonize(CONFIG_STRING(&config, "service.working_dir").c_str(), CONFIG_STRING(&config, "service.pidfile").c_str());
 // 		removeOldIcons(CONFIG_STRING(&config, "service.working_dir") + "/icons");
+    }
+	}
 	else {
 		if ((chdir(CONFIG_STRING(&config, "service.working_dir").c_str())) < 0) {
 			std::cerr << "Cannot change directory to " << CONFIG_STRING(&config, "service.working_dir") << "\n";
 			exit(1);
+		}
+	}
 #endif
 #ifdef WIN32
 	if (!run_service_name.empty()) {
 		ServiceWrapper ntservice((char *)run_service_name.c_str());
 		if (ntservice.IsInstalled()) {
 			ntservice.RunService();

0 comments (0 inline, 0 general)