From b9dd234b59de95c3c08e8c1d2989649a4b2b10f7 Mon Sep 17 00:00:00 2001 From: "jw_wonny.cha" Date: Tue, 2 Apr 2019 18:40:49 +0900 Subject: [PATCH] - applied changed function --- src/servicemgr/service_execution.go | 3 ++- src/servicemgr/servicemgr.go | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/servicemgr/service_execution.go b/src/servicemgr/service_execution.go index b0a6e24..300fe74 100644 --- a/src/servicemgr/service_execution.go +++ b/src/servicemgr/service_execution.go @@ -5,6 +5,7 @@ import ( "log" "os" "os/exec" + "restapi/httpclient" "strconv" "strings" ) @@ -89,7 +90,7 @@ func (p Service) notifyServiceStatus(status string) (err error) { } else { targetURL := p.notificationTargetURL + ConstServiceStatusNotiURI + strconv.FormatUint(p.serviceID, 10) - _, err = sendPostJSONMsg(targetURL, reqbytes) + _, err = httpclient.DoPost(targetURL, reqbytes) if err != nil { log.Println(err.Error()) } diff --git a/src/servicemgr/servicemgr.go b/src/servicemgr/servicemgr.go index 42fc12a..b068aea 100644 --- a/src/servicemgr/servicemgr.go +++ b/src/servicemgr/servicemgr.go @@ -7,6 +7,7 @@ import ( "log" "net" "os/exec" + "restapi/httpclient" "strconv" "strings" ) @@ -133,12 +134,20 @@ func executeRemoteEnv(appInfo map[string]interface{}, target string) (err error) reqBytes, _ := json.Marshal(appInfo) executeTarget := target + ":" + strconv.Itoa(ConstWellknownPort) + ConstServiceExecuteURI - str, err := sendPostJSONMsg(executeTarget, reqBytes) + respBytes, err := httpclient.DoPost(executeTarget, reqBytes) - if err == nil { - if str == ConstServiceStatusFailed { - err = errors.New("Failed") - } + var responseMsg map[string]interface{} + + err = json.Unmarshal(respBytes, &responseMsg) + if err != nil { + return + } + + log.Println("[JSON] : ", responseMsg) + + str := responseMsg[ConstKeyStatus].(string) + if str == ConstServiceStatusFailed { + err = errors.New(ConstServiceStatusFailed) } return -- 2.7.4