@@ -30,22 +30,26 @@ func (t *CreateSessionTransport) RoundTrip(request *http.Request) (*http.Respons
3030 defer func () { t .Error = err }() // dirty hack, for get error from round trip
3131 response , err := http .DefaultTransport .RoundTrip (request )
3232 if err != nil {
33- return nil , errors .New ("round trip to node: " + err .Error ())
33+ err = errors .New ("round trip to node: " + err .Error ())
34+ return nil , err
3435 }
3536
3637 b , err := ioutil .ReadAll (response .Body )
3738 if err != nil {
38- return nil , errors .New ("read node response: " + err .Error ())
39+ err = errors .New ("read node response: " + err .Error ())
40+ return nil , err
3941 }
4042 err = response .Body .Close ()
4143 if err != nil {
42- return nil , errors .New ("close response body: " + err .Error ())
44+ err = errors .New ("close response body: " + err .Error ())
45+ return nil , err
4346 }
4447
4548 var message jsonwire.NewSession
4649 err = json .Unmarshal (b , & message )
4750 if err != nil {
48- return nil , errors .New ("read body with sessionID: " + err .Error ())
51+ err = errors .New ("read body with sessionID: " + err .Error ())
52+ return nil , err
4953 }
5054 var sessionID string
5155 switch {
@@ -54,14 +58,16 @@ func (t *CreateSessionTransport) RoundTrip(request *http.Request) (*http.Respons
5458 case message .Value .SessionID != "" :
5559 sessionID = message .Value .SessionID
5660 default :
57- return nil , fmt .Errorf ("session not created, response: %s" , string (b ))
61+ err = fmt .Errorf ("session not created, response: %s" , string (b ))
62+ return nil , err
5863 }
5964 log .Infof ("register SessionID: %s on node %s" , sessionID , t .node .Address )
6065 err = t .pool .RegisterSession (t .node , sessionID )
6166 if err != nil {
62- return nil , fmt .Errorf ("sessionId not registred in storage: %s" , sessionID )
67+ err = fmt .Errorf ("sessionId not registred in storage: %s" , sessionID )
68+ return nil , err
6369 }
6470 response .Body = ioutil .NopCloser (bytes .NewReader (b ))
6571 t .IsSuccess = true
66- return response , err
72+ return response , nil
6773}
0 commit comments