tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update default port behaviour in node wizard 

fixes #10728
This commit is contained in:
Jean Flach 2015-11-27 16:36:37 +01:00
parent 737c574cdf
commit 6a83703549
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/cli/nodewizardcommand.cpp
View File

@ -182,6 +182,8 @@ wizard_endpoint_loop_start:
boost::algorithm::to_lower(answer); boost::algorithm::to_lower(answer);
choice = answer; choice = answer;
String tmpPort = "5665";
if (choice.Contains("n")) { if (choice.Contains("n")) {
Log(LogWarning, "cli", "Node to master connection setup skipped"); Log(LogWarning, "cli", "Node to master connection setup skipped");
std::cout << "Connection setup skipped. Please configure your master to connect to this node.\n"; std::cout << "Connection setup skipped. Please configure your master to connect to this node.\n";
@ -208,17 +210,15 @@ wizard_endpoint_loop_start:
std::cout << ConsoleColorTag(Console_Bold) std::cout << ConsoleColorTag(Console_Bold)
<< "Master endpoint port" << ConsoleColorTag(Console_Normal) << "Master endpoint port" << ConsoleColorTag(Console_Normal)
<< " [5665]: "; << " [" << tmpPort << "]: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer); boost::algorithm::to_lower(answer);
if (!answer.empty()) if (!answer.empty())
tmp = answer; tmpPort = answer;
else
tmp = "5665";
endpoint_buffer += "," + tmp.Trim(); endpoint_buffer += "," + tmpPort.Trim();
} }
endpoints.push_back(endpoint_buffer); endpoints.push_back(endpoint_buffer);
@ -255,15 +255,15 @@ wizard_master_host:
master_host = master_host.Trim(); master_host = master_host.Trim();
std::cout << ConsoleColorTag(Console_Bold) << "Port" std::cout << ConsoleColorTag(Console_Bold) << "Port"
<< ConsoleColorTag(Console_Normal) << " [5665]: "; << ConsoleColorTag(Console_Normal) << " [" << tmpPort << "]: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
boost::algorithm::to_lower(answer); boost::algorithm::to_lower(answer);
if (answer.empty()) if (!answer.empty())
answer = "5665"; tmpPort = answer;
String master_port = answer; String master_port = tmpPort;
master_port = master_port.Trim(); master_port = master_port.Trim();
/* workaround for fetching the master cert */ /* workaround for fetching the master cert */