From eb51bdbfef8c2aacf0fdfde279a40de7f74c8d86 Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Mon, 18 Mar 2024 21:27:24 -0400 Subject: clean up, add better error handling --- api/internal/database/database.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'api/internal/database') diff --git a/api/internal/database/database.go b/api/internal/database/database.go index 1866655..1a55127 100644 --- a/api/internal/database/database.go +++ b/api/internal/database/database.go @@ -2,23 +2,29 @@ package database import ( "database/sql" - _ "github.com/mattn/go-sqlite3" + "fmt" "log" "path/filepath" "water/api/internal/config" + + _ "github.com/mattn/go-sqlite3" ) -func EstablishDBConnection() *sql.DB { +func EstablishDBConnection() (*sql.DB, error) { c, err := config.Load() + if err != nil { + return nil, fmt.Errorf("error while reading config file: %w", err) + } driver := c.GetString("DB_DRIVER") path, err := filepath.Abs(c.GetString("DB_PATH")) + log.Println("my db path: ", path) if err != nil { - log.Fatal("There was and error getting the absolute path of the database.") + return nil, fmt.Errorf("failed to get absolute path of the database: %w", err) } db, err := sql.Open(driver, path) if err != nil { - panic(err) + return nil, fmt.Errorf("error while opening the database: %w", err) } - return db -} \ No newline at end of file + return db, nil +} -- cgit v1.1 From 655aeaac60c7dec09276f469904752c7dc58c8c5 Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Mon, 18 Mar 2024 21:29:11 -0400 Subject: remove unnessary logs. --- api/internal/database/database.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'api/internal/database') diff --git a/api/internal/database/database.go b/api/internal/database/database.go index 1a55127..1bfb789 100644 --- a/api/internal/database/database.go +++ b/api/internal/database/database.go @@ -3,7 +3,6 @@ package database import ( "database/sql" "fmt" - "log" "path/filepath" "water/api/internal/config" @@ -18,7 +17,7 @@ func EstablishDBConnection() (*sql.DB, error) { driver := c.GetString("DB_DRIVER") path, err := filepath.Abs(c.GetString("DB_PATH")) - log.Println("my db path: ", path) + if err != nil { return nil, fmt.Errorf("failed to get absolute path of the database: %w", err) } -- cgit v1.1 From fd6f6f169f9ff9a1247228fb34dc9654a9584915 Mon Sep 17 00:00:00 2001 From: Zach Berwaldt Date: Thu, 21 Mar 2024 11:23:42 -0400 Subject: fix bugs, redo layout, reorg. --- api/internal/database/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api/internal/database') diff --git a/api/internal/database/database.go b/api/internal/database/database.go index 1bfb789..8a54e4a 100644 --- a/api/internal/database/database.go +++ b/api/internal/database/database.go @@ -6,7 +6,7 @@ import ( "path/filepath" "water/api/internal/config" - _ "github.com/mattn/go-sqlite3" + _ "github.com/glebarez/go-sqlite" ) func EstablishDBConnection() (*sql.DB, error) { -- cgit v1.1