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

Make agent error output more verbose 

Adds the ran command to the agents error output

fixes #11388
This commit is contained in:
Jean Flach 2016-03-15 16:16:40 +01:00
parent f15c40c569
commit 355c2610a9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
agent/windows-setup-agent/SetupWizard.cs
View File

@ -145,14 +145,14 @@ namespace Icinga
SetRetrievalStatus(25); SetRetrievalStatus(25);
string pathPrefix = Program.Icinga2InstallDir + "\\etc\\icinga2\\pki\\" + txtInstanceName.Text; string pathPrefix = Program.Icinga2InstallDir + "\\etc\\icinga2\\pki\\" + txtInstanceName.Text;
string processArguments = "pki new-cert --cn \"" + txtInstanceName.Text + "\" --key \"" + pathPrefix + ".key\" --cert \"" + pathPrefix + ".crt\"";
string output; string output;
if (!File.Exists(pathPrefix + ".crt")) { if (!File.Exists(pathPrefix + ".crt")) {
if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe", if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe",
"pki new-cert --cn \"" + txtInstanceName.Text + "\" --key \"" + pathPrefix + ".key\" --cert \"" + pathPrefix + ".crt\"", processArguments,
out output)) { out output)) {
ShowErrorText(output); ShowErrorText("Running command 'icinga2.exe " + processArguments + "' produced the following output:\n" + output);
return; return;
} }
} }
@ -161,10 +161,11 @@ namespace Icinga
_TrustedFile = Path.GetTempFileName(); _TrustedFile = Path.GetTempFileName();
processArguments = "pki save-cert --host \"" + host + "\" --port \"" + port + "\" --key \"" + pathPrefix + ".key\" --cert \"" + pathPrefix + ".crt\" --trustedcert \"" + _TrustedFile + "\"";
if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe", if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe",
"pki save-cert --host \"" + host + "\" --port \"" + port + "\" --key \"" + pathPrefix + ".key\" --cert \"" + pathPrefix + ".crt\" --trustedcert \"" + _TrustedFile + "\"", processArguments,
out output)) { out output)) {
ShowErrorText(output); ShowErrorText("Running command 'icinga2.exe " + processArguments + "' produced the following output:\n" + output);
return; return;
} }
@ -216,7 +217,7 @@ namespace Icinga
if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe", if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe",
"node setup" + args, "node setup" + args,
out output)) { out output)) {
ShowErrorText(output); ShowErrorText("Running command 'icinga2.exe " + "node setup" + args + "' produced the following output:\n" + output);
return; return;
} }
@ -238,14 +239,14 @@ namespace Icinga
if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe", if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe",
"daemon --validate", "daemon --validate",
out output)) { out output)) {
ShowErrorText(output); ShowErrorText("Running command 'icinga2.exe daemon --validate' produced the following output:\n" + output);
return; return;
} }
if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe", if (!RunProcess(Program.Icinga2InstallDir + "\\sbin\\icinga2.exe",
"--scm-install daemon", "--scm-install daemon",
out output)) { out output)) {
ShowErrorText(output); ShowErrorText("Running command 'icinga2.exe daemon --scm-install daemon' produced the following output:\n" + output);
return; return;
} }