Applied Code Review

diff --git a/src/servicemgr/http_handler.go b/src/servicemgr/http_handler.go
index f46e64f..6d8e45b 100644 (file)
--- a/src/servicemgr/http_handler.go
+++ b/src/servicemgr/http_handler.go
@@ -9,15 +9,6 @@ import (
 
 var errInvalidService = errors.New("It is Invalid Service")
 
-func checkServiceName(serviceID uint64) bool {
-       _, err := GetServiceName(serviceID)
-       if err != nil {
-               log.Println(err.Error())
-               return false
-       }
-       return true
-}
-
 func checkHTTPError(w http.ResponseWriter, err error) {
        if err != nil {
                http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -26,70 +17,66 @@ func checkHTTPError(w http.ResponseWriter, err error) {
 }
 
 // CreateServiceHandler function
-func CreateServiceHandler(w http.ResponseWriter, req *http.Request) (ServiceParam, error) {
+func CreateServiceHandler(w http.ResponseWriter, req *http.Request) (serviceParam ServiceParam, err error) {
        decoder := json.NewDecoder(req.Body)
 
-       serviceParam := ServiceParam{}
-       err := decoder.Decode(&serviceParam)
+       err = decoder.Decode(&serviceParam)
        if err != nil {
                log.Println(err)
-               return serviceParam, err
+               return
        }
 
-       return serviceParam, nil
+       return
 }
 
 // ExecuteServiceHandler function
-func ExecuteServiceHandler(w http.ResponseWriter, req *http.Request, serviceID uint64) (DistService, error) {
-       distService := DistService{}
-
-       if checkServiceName(serviceID) == false {
-               return distService, errInvalidService
+func ExecuteServiceHandler(w http.ResponseWriter, req *http.Request, serviceID uint64) (distService DistService, err error) {
+       _, err = GetServiceName(serviceID)
+       if err != nil {
+               return
        }
 
        decoder := json.NewDecoder(req.Body)
-       err := decoder.Decode(&distService)
+       err = decoder.Decode(&distService)
        if err != nil {
-               return distService, err
+               return
        }
 
-       return distService, nil
+       return
 }
 
 // DeleteServiceHandler function
-func DeleteServiceHandler(w http.ResponseWriter, req *http.Request, serviceID uint64) error {
-       if checkServiceName(serviceID) == false {
-               return errInvalidService
+func DeleteServiceHandler(w http.ResponseWriter, req *http.Request, serviceID uint64) (err error) {
+       cmd, err := GetCmd(serviceID)
+       if err != nil {
+               return
        }
 
-       cmd, _ := GetCmd(serviceID)
-
-       err := cmd.Process.Kill()
+       err = cmd.Process.Kill()
        if err != nil {
                log.Println("Error occured from Process.Kill() : ", err)
-               return err
+               return
        }
 
-       return nil
+       return
 }
 
 // DataPathHandler function
-func DataPathHandler(w http.ResponseWriter, req *http.Request, serviceID uint64) error {
-       if checkServiceName(serviceID) == false {
-               return errInvalidService
+func DataPathHandler(w http.ResponseWriter, req *http.Request, serviceID uint64) (err error) {
+       msgChan, err := GetMsgChan(serviceID)
+       if err != nil {
+               return
        }
 
-       msgChan, _ := GetMsgChan(serviceID)
-
        decoder := json.NewDecoder(req.Body)
        msgFormat := MsgFormat{}
-       err := decoder.Decode(&msgFormat)
+       err = decoder.Decode(&msgFormat)
 
        if err != nil {
-               return err
+               return
        }
 
        msgChan <- msgFormat
 
-       return nil
+       return
 }

diff --git a/src/servicemgr/message_queue.go b/src/servicemgr/message_queue.go
index 4546c93..71a9306 100644 (file)
--- a/src/servicemgr/message_queue.go
+++ b/src/servicemgr/message_queue.go
@@ -66,7 +66,12 @@ func Pull(serviceID uint64, outputMsg chan MsgFormat, ctlChan chan bool) error {
        pullSock.Bind(fmt.Sprintf("ipc://%d", serviceID))
 
        for {
-               msg, _ := pullSock.Recv(0)
+               msg, err := pullSock.Recv(0)
+               if err != nil {
+                       log.Println(err.Error())
+                       continue
+               }
+
                fmt.Println("Recv:", string(msg))
 
                parsedMsg := MsgFormat{}

diff --git a/src/servicemgr/service_agent.go b/src/servicemgr/service_agent.go
index 91e9ded..680d42c 100644 (file)
--- a/src/servicemgr/service_agent.go
+++ b/src/servicemgr/service_agent.go
@@ -39,7 +39,9 @@ func Create(serviceParam ServiceParam) []byte {
 
 // Run is for executing service
 func Run(distService DistService, serviceID uint64) {
-       if checkServiceName(serviceID) == false {
+       serviceName, err := GetServiceName(serviceID)
+       if err != nil {
+               log.Println(err.Error())
                return
        }
 
@@ -52,8 +54,6 @@ func Run(distService DistService, serviceID uint64) {
        args = append(args, strconv.Itoa(distService.SystemParam.Port))
        args = append(args, "--remote")
 
-       serviceName, _ := GetServiceName(serviceID)
-
        service := Service{serviceID, serviceName, args}
        service.execute()
 }