fix: lint issues

Signed-off-by: Pranshu Srivastava <[email protected]>
keploy · Sep 14, 2024 · 9aca297 · 9aca297
1 parent 5665c34
commit 9aca297
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/echo-sql/handler.go b/echo-sql/handler.go
@@ -85,7 +85,7 @@ func InsertURL(c context.Context, entry URLEntry) error {
 	`
 
 	selectQuery := `
-			SELECT * 
+			SELECT *
 			FROM url_map
 			WHERE id = $1
 	`
@@ -100,7 +100,7 @@ func InsertURL(c context.Context, entry URLEntry) error {
 	if err != nil {
 		return err
 	}
-	defer handleDeferError(res.Close())
+	defer handleDeferError(res.Close)
 	if res.Next() { // If we get rows back, that means we have a duplicate URL
 		var savedEntry URLEntry
 		err := res.Scan(&savedEntry.ID, &savedEntry.RedirectURL, &savedEntry.CreatedAt, &savedEntry.UpdatedAt)
@@ -133,7 +133,7 @@ func GetURL(c echo.Context) error {
 	id := c.Param("param")
 
 	findURLQuery := `
-		SELECT * 
+		SELECT *
 		FROM url_map
 		WHERE id = $1
 	`
@@ -143,7 +143,7 @@ func GetURL(c echo.Context) error {
 		Logger.Error(err.Error())
 		return echo.NewHTTPError(http.StatusInternalServerError, "Error encountered while attempting to lookup URL.")
 	}
-	defer handleDeferError(res.Close())
+	defer handleDeferError(res.Close)
 	if !res.Next() {
 		return echo.NewHTTPError(http.StatusNotFound, "Invalid URL ID.")
 	}
@@ -208,7 +208,7 @@ func UpdateURL(c echo.Context) error {
 	}
 
 	selectQuery := `
-			SELECT * 
+			SELECT *
 			FROM url_map
 			WHERE id = $1
 	`
@@ -223,7 +223,7 @@ func UpdateURL(c echo.Context) error {
 	if err != nil {
 		return err
 	}
-	defer handleDeferError(res.Close())
+	defer handleDeferError(res.Close)
 	if res.Next() { // If we get rows back, that means we have a duplicate URL
 		var savedEntry URLEntry
 		err := res.Scan(&savedEntry.ID, &savedEntry.RedirectURL, &savedEntry.CreatedAt, &savedEntry.UpdatedAt)

diff --git a/echo-sql/main.go b/echo-sql/main.go
@@ -21,10 +21,10 @@ var Logger *zap.Logger
 
 var Database *sql.DB
 
-func handleDeferError(err error) {
-	if err != nil {
-		Logger.Fatal(err.Error())
-	}
+func handleDeferError(fn func()	error) {
+    if err := fn(); err != nil {
+        Logger.Error("error occurred during deferred call: %v", zap.Error(err))
+    }
 }
 
 func main() {
@@ -34,7 +34,7 @@ func main() {
 	}
 	var err error
 	Logger, _ = zap.NewProduction()
-	defer handleDeferError(Logger.Sync()) // flushes buffer
+	defer handleDeferError(Logger.Sync) // flushes buffer
 
 	Database, err = NewConnection(ConnectionDetails{
 		host: "postgresDb",
@@ -50,7 +50,7 @@ func main() {
 		Logger.Fatal("Failed to establish connection to local PostgreSQL instance:", zap.Error(err))
 	}
 
-	defer Database.Close()
+	defer handleDeferError(Database.Close)
 
 	// init Keploy