irccd: irccd-test/main.cpp comparison

Irccd: load config in irccd-test

author	David Demelier <markand@malikania.fr>
date	Fri, 03 Aug 2018 12:15:00 +0200
parents	e08bfc940c54
children	c216d148558d

comparison

equal deleted inserted replaced

-:903415e8ee2e
+:fe3d80412701
 plugin = daemon->plugins().get("test");
 }
 // }}}
+// {{{ load_config
+auto load_config(const option::result& result) -> config
+{
+auto it = result.find("-c");
+if (it != result.end() || (it = result.find("--config")) != result.end())
+return config(it->second);
+auto cfg = config::search("irccd.conf");
+return *cfg;
+}
+// }}}
 // {{{ load_options
 void load_options(int& argc, char**& argv)
 {
-const option::options def{
+static const option::options def{
 { "-c",         true    },
 { "--config",   true    }
 };
-auto result = option::read(argc, argv, def);
+try {
-auto it = result.find("-c");
+daemon->set_config(load_config(option::read(argc, argv, def)));
+} catch (const std::exception& ex) {
-if (it == result.end())
+throw std::runtime_error(str(format("%1%") % ex.what()));
-it = result.find("--config");
-if (it != result.end()) {
-try {
-daemon->set_config(it->second);
-} catch (const std::exception& ex) {
-throw std::runtime_error(str(format("%1%: %2%") % it->second % ex.what()));
-}
 }
 }
 // }}}

Mercurial > irccd