From dc478a0cfa37c83c86790481ee5c77cb61c7f10c Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Mon, 30 Jul 2012 10:05:35 +0200
Subject: [PATCH] Replace  in portfile option

---
 spectrum/src/sample.cfg | 1 +
 src/config.cpp          | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/spectrum/src/sample.cfg b/spectrum/src/sample.cfg
index 2362914e..1b4f17b9 100644
--- a/spectrum/src/sample.cfg
+++ b/spectrum/src/sample.cfg
@@ -20,6 +20,7 @@ protocol=prpl-msn
 #protocol=any
 #protocol=prpl-icq
 working_dir=./
+portfile=$jid.port
 
 [backend]
 #default_avatar=catmelonhead.jpg
diff --git a/src/config.cpp b/src/config.cpp
index 86078320..f3110e8b 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -134,6 +134,7 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
 
 	bool found_working = false;
 	bool found_pidfile = false;
+	bool found_portfile = false;
 	bool found_backend_port = false;
 	bool found_database = false;
 	std::string jid = "";
@@ -159,6 +160,9 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
 		else if (opt.string_key == "service.pidfile") {
 			found_pidfile = true;
 		}
+		else if (opt.string_key == "service.portfile") {
+			found_portfile = true;
+		}
 		else if (opt.string_key == "database.database") {
 			found_database = true;
 		}
@@ -174,6 +178,11 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
 		value.push_back("/var/run/spectrum2/$jid.pid");
 		parsed.options.push_back(boost::program_options::basic_option<char>("service.pidfile", value));
 	}
+	if (!found_portfile) {
+		std::vector<std::string> value;
+		value.push_back("/var/run/spectrum2/$jid.port");
+		parsed.options.push_back(boost::program_options::basic_option<char>("service.portfile", value));
+	}
 	if (!found_backend_port) {
 		std::vector<std::string> value;
 		std::string p = boost::lexical_cast<std::string>(getRandomPort(_jid.empty() ? jid : _jid));