Merge branch 'master' of github.com:smancke/guble into feature/reuse-…

…client-connections-for-nexmo
smancke · Feb 7, 2017 · 790e5a3 · 790e5a3
2 parents 9ec6004 + fc36fac
commit 790e5a3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/server/sms/nexmo_sms_sender.go b/server/sms/nexmo_sms_sender.go
@@ -43,8 +43,9 @@ const (
 )
 
 var (
-	ErrNoSMSSent         = errors.New("No sms was sent to Nexmo")
-	ErrIncompleteSMSSent = errors.New("Nexmo sms was only partial delivered.One or more part returned an error")
+	ErrNoSMSSent                 = errors.New("No sms was sent to Nexmo")
+	ErrIncompleteSMSSent         = errors.New("Nexmo sms was only partial delivered.One or more part returned an error")
+	ErrSMSResponseDecodingFailed = errors.New("Nexmo response decoding failed.")
 )
 
 var nexmoResponseCodeMap = map[ResponseCode]string{
@@ -150,19 +151,23 @@ func (ns *NexmoSender) sendSms(sms *NexmoSms) (*NexmoMessageResponse, error) {
 
 	resp, err := (&http.Client{}).Do(req)
 	if err != nil {
-		logger.WithField("error", err.Error()).Error("Error doing the request to nexmo endpoint.")
+		logger.WithField("error", err.Error()).Error("Error doing the request to nexmo endpoint")
 		ns.createHttpClient()
-		return nil, err
+		return nil, ErrNoSMSSent
 	}
 	defer resp.Body.Close()
 
 	var messageResponse *NexmoMessageResponse
-	respBody, _ := ioutil.ReadAll(resp.Body)
+	respBody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		logger.WithField("error", err.Error()).Error("Error reading the nexmo body response")
+		return nil, ErrSMSResponseDecodingFailed
+	}
 
 	err = json.Unmarshal(respBody, &messageResponse)
 	if err != nil {
 		logger.WithField("error", err.Error()).Error("Error decoding the response from nexmo endpoint")
-		return nil, err
+		return nil, ErrSMSResponseDecodingFailed
 	}
 	logger.WithField("messageResponse", messageResponse).Debug("Actual nexmo response")
 

diff --git a/server/sms/sms_gateway.go b/server/sms/sms_gateway.go
@@ -116,7 +116,7 @@ func (g *gateway) Run() {
 		g.logger.WithField("error", err.Error()).Error("Error returned by gateway proxy loop")
 
 		// If Route channel closed, try restarting
-		if err == connector.ErrRouteChannelClosed || err == ErrNoSMSSent || err == ErrIncompleteSMSSent {
+		if isRestartableErr(err) {
 			g.Restart()
 			return
 		}
@@ -138,6 +138,12 @@ func (g *gateway) Run() {
 		}
 	}
 }
+func isRestartableErr(err error) bool {
+	return err == connector.ErrRouteChannelClosed ||
+		err == ErrNoSMSSent ||
+		err == ErrIncompleteSMSSent ||
+		err == ErrSMSResponseDecodingFailed
+}
 
 func (g *gateway) proxyLoop() error {
 	var (