Fix errcheck in httpreplay

Author: Ravi Tandon

.gitignore

@@ -23,3 +23,4 @@ debug.test
 docs/solutions/rhel74_image/ipxe.sh
 vendor/github.com/oracle/oci-go-sdk/target
 *.test
+oci/record/

httpreplay/common.go

@@ -4,11 +4,12 @@ package httpreplay
 
 import (
 	"fmt"
-	"gopkg.in/yaml.v2"
 	"log"
 	"net/http"
 	"os"
 	"path/filepath"
+
+	"gopkg.in/yaml.v2"
 )
 
 func initDebugStyle() {
@@ -26,7 +27,10 @@ var currentLogger *log.Logger
 // DebugLogf logs a formatted string to stderr.  It should be considered temporary, and in a release version either removed or replaced with a passed-in logging interface.
 func debugLogf(format string, v ...interface{}) {
 	if currentLogger != nil {
-		currentLogger.Output(2, fmt.Sprintf(format, v...))
+		err := currentLogger.Output(2, fmt.Sprintf(format, v...))
+		if err != nil {
+			log.Println("[WARN] Failed to write to current logger")
+		}
 	}
 	// debug.PrintStack()
 }
@@ -66,8 +70,6 @@ func save(d interface{}, fn string) error {
 		return err
 	}
 
-	defer f.Close()
-
 	// Honor the YAML structure specification
 	// http://www.yaml.org/spec/1.2/spec.html#id2760395
 	_, err = f.Write([]byte("---\n"))
@@ -80,5 +82,9 @@ func save(d interface{}, fn string) error {
 		return err
 	}
 
+	err = f.Close()
+	if err != nil {
+		return err
+	}
 	return nil
 }

httpreplay/proxy.go

@@ -322,7 +322,10 @@ func (r *Proxy) Stop() error {
 // HandleRequest determine the calling roundTrip in different mode
 func (r *Proxy) HandleRequest(req *http.Request, realTransport http.RoundTripper) (*http.Response, error) {
 	if r.mode == ByPassing {
-		realTransport.RoundTrip(req)
+		response, err := realTransport.RoundTrip(req)
+		if err != nil {
+			return response, err
+		}
 	}
 
 	_, resp, err := r.requestHandler(req, realTransport)

httpreplay/scenario.go

@@ -5,7 +5,6 @@ package httpreplay
 import (
 	"errors"
 	"fmt"
-	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -14,6 +13,8 @@ import (
 	"sort"
 	"strings"
 	"sync"
+
+	"gopkg.in/yaml.v2"
 )
 
 // Scenario format versions
@@ -431,9 +432,6 @@ func (s *Scenario) Save() error {
 	if err != nil {
 		return err
 	}
-	defer func() {
-		f.Close()
-	}()
 
 	_, err = f.Write([]byte("---\n"))
 	if err != nil {
@@ -455,6 +453,11 @@ func (s *Scenario) Save() error {
 	//if err != nil {
 	//	return err
 	//}
+
+	err = f.Close()
+	if err != nil {
+		return err
+	}
 	return nil
 }