fix #14

LazarenkoA · Mar 24, 2022 · cc352f1 · cc352f1
1 parent aa9ea39
commit cc352f1
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 99 deletions.
diff --git a/.idea/prometheus_1C_exporter.iml b/.idea/prometheus_1C_exporter.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/explorers/AvailablePerformance.go b/explorers/AvailablePerformance.go
@@ -134,7 +134,7 @@ func (this *ExplorerAvailablePerformance) readData() (string, error) {
 
 	param = append(param, "process")
 	param = append(param, "list")
-	this.appendLogPass(param)
+	param = this.appendLogPass(param)
 	param = append(param, fmt.Sprintf("--cluster=%v", this.GetClusterID()))
 
 	cmdCommand := exec.Command(this.settings.RAC_Path(), param...)

diff --git a/explorers/BaseExplorer.go b/explorers/BaseExplorer.go
@@ -243,13 +243,14 @@ func (this *BaseRACExplorer) formatResult(strIn string) map[string]string {
 	return result
 }
 
-func (this *BaseRACExplorer) appendLogPass(param []string) {
+func (this *BaseRACExplorer) appendLogPass(param []string) []string {
 	if login := this.settings.RAC_Login(); login != "" {
 		param = append(param, fmt.Sprintf("--cluster-user=%v", login))
 		if pwd := this.settings.RAC_Pass(); pwd != "" {
 			param = append(param, fmt.Sprintf("--cluster-pwd=%v", pwd))
 		}
 	}
+	return param
 }
 
 func normalizeEncoding(str string) string {

diff --git a/explorers/Connects.go b/explorers/Connects.go
@@ -106,7 +106,7 @@ func (this *ExplorerConnects) getConnects() (connData []map[string]string, err e
 
 	param = append(param, "connection")
 	param = append(param, "list")
-	this.appendLogPass(param)
+	param = this.appendLogPass(param)
 
 	param = append(param, fmt.Sprintf("--cluster=%v", this.GetClusterID()))
 

diff --git a/explorers/ExplorerCheckSheduleJob.go b/explorers/ExplorerCheckSheduleJob.go
@@ -175,7 +175,7 @@ func (this *ExplorerCheckSheduleJob) getInfoBase(baseGuid, basename string) (map
 
 	param = append(param, "infobase")
 	param = append(param, "info")
-	this.appendLogPass(param)
+	param = this.appendLogPass(param)
 
 	param = append(param, fmt.Sprintf("--cluster=%v", this.GetClusterID()))
 	param = append(param, fmt.Sprintf("--infobase=%v", baseGuid))
@@ -226,7 +226,7 @@ func (this *ExplorerCheckSheduleJob) fillBaseList() error {
 		param = append(param, "infobase")
 		param = append(param, "summary")
 		param = append(param, "list")
-		this.appendLogPass(param)
+		param = this.appendLogPass(param)
 		param = append(param, fmt.Sprintf("--cluster=%v", this.GetClusterID()))
 
 		if result, err := this.run(exec.Command(this.settings.RAC_Path(), param...)); err != nil {

diff --git a/explorers/ExplorerClientLic.go b/explorers/ExplorerClientLic.go
@@ -109,7 +109,7 @@ func (this *ExplorerClientLic) getLic() (licData []map[string]string, err error)
 
 	param = append(param, "session")
 	param = append(param, "list")
-	this.appendLogPass(param)
+	param = this.appendLogPass(param)
 
 	param = append(param, "--licenses")
 	param = append(param, fmt.Sprintf("--cluster=%v", this.GetClusterID()))

diff --git a/explorers/Sessions.go b/explorers/Sessions.go
@@ -100,7 +100,7 @@ func (this *ExplorerSessions) getSessions() (sesData []map[string]string, err er
 
 	param = append(param, "session")
 	param = append(param, "list")
-	this.appendLogPass(param)
+	param = this.appendLogPass(param)
 
 	param = append(param, fmt.Sprintf("--cluster=%v", this.GetClusterID()))