[preprocessor/folder] log error when setting db error status from caller

likecoin · Jun 5, 2024 · 645450a · 645450a
1 parent e76e219
commit 645450a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/preprocessor/folder/database.go b/preprocessor/folder/database.go
@@ -2,7 +2,6 @@ package folder
 
 import (
 	"fmt"
-	"log"
 	"time"
 
 	"github.com/jackc/pgx/v5"
@@ -99,7 +98,7 @@ func setFileStatusDone(connPool *pgxpool.Pool, filePath string, cid string) erro
 }
 
 // setFileStatusError sets the status of a file to error with the error message
-func setFileStatusError(connPool *pgxpool.Pool, filePath string, errorMessage string) {
+func setFileStatusError(connPool *pgxpool.Pool, filePath string, errorMessage string) error {
 	_, err := connPool.Exec(
 		db.GetDatabaseContext(),
 		"UPDATE file_status SET status = $1, error = $2, updated_at = $3 WHERE file_path = $4;",
@@ -108,7 +107,5 @@ func setFileStatusError(connPool *pgxpool.Pool, filePath string, errorMessage st
 		time.Now().UTC(),
 		filePath,
 	)
-	if err != nil {
-		log.Println("error setting file status to error:", err)
-	}
+	return err
 }
diff --git a/preprocessor/folder/file.go b/preprocessor/folder/file.go
@@ -2,6 +2,7 @@ package folder
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -79,7 +80,9 @@ func handleNewFile(pgPool *pgxpool.Pool, filePath string) (string, error) {
 	}
 	metadata, err := getFileMetadata(filePath)
 	if err != nil {
-		setFileStatusError(pgPool, filePath, err.Error())
+		if err = setFileStatusError(pgPool, filePath, err.Error()); err != nil {
+			log.Println("error setting file status to error:", err)
+		}
 		return "", fmt.Errorf("error getting metadata for file %s: %v", filePath, err)
 	}
 	err = setFileStatusUploading(pgPool, filePath)
@@ -88,7 +91,9 @@ func handleNewFile(pgPool *pgxpool.Pool, filePath string) (string, error) {
 	}
 	resp, err := webhook.PostFileToWebHook(filePath, metadata, webhook.PostGenericWebhookOpt{})
 	if err != nil {
-		setFileStatusError(pgPool, filePath, err.Error())
+		if err = setFileStatusError(pgPool, filePath, err.Error()); err != nil {
+			log.Println("error setting file status to error:", err)
+		}
 		return "", fmt.Errorf("error posting metadata for file %s: %v", filePath, err)
 	}
 	err = setFileStatusDone(pgPool, filePath, cid)