hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified controller config parsing - behaviour unchanged.

Browse source
This commit is contained in:
Thulinma 2014-12-15 18:14:00 +01:00
parent 85fe9d1713
commit da612d03b6
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/controller/controller.cpp
View file

@ -168,20 +168,14 @@ int main(int argc, char ** argv){
}
//check for port, interface and username in arguments
//if they are not there, take them from config file, if there
if (Controller::conf.getOption("listen_port", true).size() <= 1){
if (Controller::Storage["config"]["controller"]["port"]){
Controller::conf.getOption("listen_port") = Controller::Storage["config"]["controller"]["port"];
}
if (Controller::Storage["config"]["controller"]["port"]){
Controller::conf.getOption("listen_port", true)[0u] = Controller::Storage["config"]["controller"]["port"];
}
if (Controller::conf.getOption("listen_interface", true).size() <= 1){
if (Controller::Storage["config"]["controller"]["interface"]){
Controller::conf.getOption("listen_interface") = Controller::Storage["config"]["controller"]["interface"];
}
if (Controller::Storage["config"]["controller"]["interface"]){
Controller::conf.getOption("listen_interface", true)[0u] = Controller::Storage["config"]["controller"]["interface"];
}
if (Controller::conf.getOption("username", true).size() <= 1){
if (Controller::Storage["config"]["controller"]["username"]){
Controller::conf.getOption("username") = Controller::Storage["config"]["controller"]["username"];
}
if (Controller::Storage["config"]["controller"]["username"]){
Controller::conf.getOption("username", true)[0u] = Controller::Storage["config"]["controller"]["username"];
}
Controller::checkAvailProtocols();
createAccount(Controller::conf.getString("account"));