libtransport.git Changeset - ddec6a8e1ac5

Changeset - ddec6a8e1ac5

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Jan Kaluza - 13 years ago 2012-05-30 11:14:56
hanzz.k@gmail.com

removed Config::getUnregistered. CONFIG_* macros should be used instead even for unregistered options

5 files changed with 19 insertions and 14 deletions:

backends/libcommuni/main.cpp

backends/libcommuni/singleircnetworkplugin.cpp

backends/smstools3/main.cpp

include/transport/config.h

src/config.cpp

0 comments (0 inline, 0 general)

backends/libcommuni/main.cpp

➞

Show inline comments

@@ @@ -75,13 +75,13 @@ int main (int argc, char* argv[]) { @@
 	QCoreApplication app(argc, argv);
 	Logging::initBackendLogging(&config);
 	Swift::QtEventLoop eventLoop;
-	if (config.getUnregistered().find("service.irc_server") == config.getUnregistered().end()) {
+	if (!CONFIG_HAS_KEY(&config, "service.irc_server")) {
 		np = new IRCNetworkPlugin(&config, &eventLoop, host, port);
+	}
 	else {
 		np = new SingleIRCNetworkPlugin(&config, &eventLoop, host, port);
+	}

backends/libcommuni/singleircnetworkplugin.cpp

➞

Show inline comments

@@ @@ -7,19 +7,25 @@ @@
 #define TO_UTF8(WHAT) std::string((WHAT).toUtf8().data(), (WHAT).toUtf8().size())
 DEFINE_LOGGER(logger, "SingleIRCNetworkPlugin");
 SingleIRCNetworkPlugin::SingleIRCNetworkPlugin(Config *config, Swift::QtEventLoop *loop, const std::string &host, int port) {
 	this->config = config;
 	m_server = config->getUnregistered().find("service.irc_server")->second;
 	if (CONFIG_HAS_KEY(config, "service.irc_server")) {
 		m_server = CONFIG_STRING(config, "service.irc_server");
+	}
 	else {
 		LOG4CXX_ERROR(logger, "No [service] irc_server defined, exiting...");
 		exit(-1);
+	}
 	m_socket = new QTcpSocket();
 	m_socket->connectToHost(FROM_UTF8(host), port);
 	connect(m_socket, SIGNAL(readyRead()), this, SLOT(readData()));
 	if (config->getUnregistered().find("service.irc_identify") != config->getUnregistered().end()) {
 		m_identify = config->getUnregistered().find("service.irc_identify")->second;
 	if (CONFIG_HAS_KEY(config, "service.irc_identify")) {
 		m_identify = CONFIG_STRING(config, "service.irc_identify");
+	}
 	else {
 		m_identify = "NickServ identify $name $password";
+	}
 	LOG4CXX_INFO(logger, "SingleIRCNetworkPlugin for server " << m_server << " initialized.");

backends/smstools3/main.cpp

➞

Show inline comments

@@ @@ -121,14 +121,14 @@ class SMSNetworkPlugin : public NetworkPlugin { @@
 			LOG4CXX_INFO(logger, "Forwarding SMS from " << from << " to " << to << ".");
 			handleMessage(to, from, msg);
+		}
 		void handleSMSDir() {
 			std::string dir = "/var/spool/sms/incoming/";
 			if (config->getUnregistered().find("backend.incoming_dir") != config->getUnregistered().end()) {
 				dir = config->getUnregistered().find("backend.incoming_dir")->second;
 			if (CONFIG_HAS_KEY(config, "backend.incoming_dir")) {
 				dir = CONFIG_STRING(config, "backend.incoming_dir");
+			}
 			LOG4CXX_INFO(logger, "Checking directory " << dir << " for incoming SMS.");
 			path p(dir);
 			directory_iterator end_itr;
 			for (directory_iterator itr(p); itr != end_itr; ++itr) {

include/transport/config.h

➞

Show inline comments

@@ @@ -74,36 +74,35 @@ class Config { @@
 		/// \param configfile path to config file
 		bool load(const std::string &configfile, const std::string &jid = "");
 		bool reload();
 		bool hasKey(const std::string &key) {
 			return m_variables.find(key) != m_variables.end();
+			return m_variables.find(key) != m_variables.end() || m_unregistered.find(key) != m_unregistered.end();
+		}
 		/// Returns value of variable defined by key.
 		/// For variables in sections you can use "section.variable" key format.
 		/// \param key config variable name
 		const boost::program_options::variable_value &operator[] (const std::string &key) {
 			return m_variables[key];
 			if (m_variables.find(key) != m_variables.end()) {
 				return m_variables[key];
+			}
 			return m_unregistered[key];
+		}
 		/// Returns path to config file from which data were loaded.
 		const std::string &getConfigFile() { return m_file; }
 		const std::map<std::string, std::string> &getUnregistered() {
 			return m_unregistered;
+		}
 		/// This signal is emitted when config is loaded/reloaded.
 		boost::signal<void ()> onConfigReloaded;
 	private:
 		int m_argc;
 		char **m_argv;
 		Variables m_variables;
-		std::map<std::string, std::string> m_unregistered;
+		std::map<std::string, boost::program_options::variable_value> m_unregistered;
 		std::string m_file;
 };
+}

src/config.cpp

➞

Show inline comments

 		value.push_back("/var/lib/spectrum2/$jid/database.sql");
 		parsed.options.push_back(boost::program_options::basic_option<char>("database.database", value));
+	}
 	BOOST_FOREACH(option &opt, parsed.options) {
 		if (opt.unregistered) {
 			m_unregistered[opt.string_key] = opt.value[0];
+			m_unregistered[opt.string_key] = variable_value(opt.value[0], false);
+		}
 		else if (opt.value[0].find("$jid") != std::string::npos) {
 			boost::replace_all(opt.value[0], "$jid", jid);
+		}
+	}

0 comments (0 inline, 0 general)