wh1te909
/
rmmagent
mirror of https://github.com/wh1te909/rmmagent.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix false installer errors

This commit is contained in:
wh1te909 2020-10-26 20:46:54 -07:00
parent 4c644f67ca
commit 1d71942bdb
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
agent/install_windows.go
View File

@ -154,9 +154,6 @@ func (a *WindowsAgent) Install(i *Installer) {
if meshErr != nil { if meshErr != nil {
a.installerMsg(fmt.Sprintf("Failed to install mesh agent: %s", meshErr.Error()), "error") a.installerMsg(fmt.Sprintf("Failed to install mesh agent: %s", meshErr.Error()), "error")
} }
if meshOut[1] != "" {
a.installerMsg(fmt.Sprintf("Failed to install mesh agent: %s", meshOut[1]), "error")
}
fmt.Println(meshOut) fmt.Println(meshOut)
a.Logger.Debugln("Sleeping for 10") a.Logger.Debugln("Sleeping for 10")
@ -276,7 +273,7 @@ func (a *WindowsAgent) Install(i *Installer) {
"/start-minion=1", "/start-minion=1",
} }
a.Logger.Debugln("Installing salt with:", saltInstallArgs) a.Logger.Debugln("Installing salt with:", a.SaltInstaller, saltInstallArgs)
_, saltErr := CMD(a.SaltInstaller, saltInstallArgs, int(i.Timeout), false) _, saltErr := CMD(a.SaltInstaller, saltInstallArgs, int(i.Timeout), false)
if saltErr != nil { if saltErr != nil {
a.installerMsg(fmt.Sprintf("Unable to install salt: %s", saltErr.Error()), "error") a.installerMsg(fmt.Sprintf("Unable to install salt: %s", saltErr.Error()), "error")
@ -370,11 +367,8 @@ func (a *WindowsAgent) Install(i *Installer) {
} }
for _, s := range svcCommands { for _, s := range svcCommands {
a.Logger.Debugln(s) a.Logger.Debugln(a.Nssm, s)
_, nssmErr := CMD(a.Nssm, s, 15, false) _, _ = CMD(a.Nssm, s, 25, false)
if nssmErr != nil {
a.installerMsg(nssmErr.Error(), "error")
}
} }
if i.Power { if i.Power {