refactor(model): move to database dir

added database connection pool config
MrMissx · Mar 3, 2024 · 8b37fa1 · 8b37fa1
1 parent 69cf011
commit 8b37fa1
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 8 deletions.
diff --git a/database/database.go b/database/database.go
@@ -1,6 +1,8 @@
 package database
 
 import (
+	"time"
+
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
 	"github.com/mrmissx/stashbin/utils"
@@ -17,6 +19,10 @@ func ConnectDb() {
 	utils.Logger.Info("Connecting to database...")
 
 	db := sqlx.MustConnect("postgres", dbUri)
+	db.SetMaxIdleConns(5)
+	db.SetMaxOpenConns(10)
+	db.SetConnMaxIdleTime(10 * time.Minute)
+	db.SetConnMaxLifetime(1 * time.Hour)
 
 	session = db
 	utils.Logger.Info("Successfuly connected database")

diff --git a/model/document.go → database/model/document.go b/model/document.go → database/model/document.go
diff --git a/handler/api/document.go b/handler/api/document.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/jmoiron/sqlx"
 	"github.com/labstack/echo/v4"
-	"github.com/mrmissx/stashbin/model"
-	"github.com/mrmissx/stashbin/response"
+	"github.com/mrmissx/stashbin/database/model"
+	"github.com/mrmissx/stashbin/utils/response"
 )
 
 func GetDocumentBySlug(c echo.Context) error {

diff --git a/handler/api/health.go b/handler/api/health.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/mrmissx/stashbin/response"
+	"github.com/mrmissx/stashbin/utils/response"
 )
 
 func HealthCheck(c echo.Context) error {

diff --git a/handler/page/about.go b/handler/page/about.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/labstack/echo/v4"
 
-	"github.com/mrmissx/stashbin/response"
+	"github.com/mrmissx/stashbin/utils/response"
 	"github.com/mrmissx/stashbin/view"
 )
 

diff --git a/handler/page/document.go b/handler/page/document.go
@@ -6,8 +6,8 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/labstack/echo/v4"
 
-	"github.com/mrmissx/stashbin/model"
-	"github.com/mrmissx/stashbin/response"
+	"github.com/mrmissx/stashbin/database/model"
+	"github.com/mrmissx/stashbin/utils/response"
 	"github.com/mrmissx/stashbin/view"
 )
 

diff --git a/handler/page/index.go b/handler/page/index.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/labstack/echo/v4"
 
-	"github.com/mrmissx/stashbin/response"
+	"github.com/mrmissx/stashbin/utils/response"
 	"github.com/mrmissx/stashbin/view"
 )
 

diff --git a/handler/page/raw.go b/handler/page/raw.go
@@ -6,7 +6,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/labstack/echo/v4"
 
-	"github.com/mrmissx/stashbin/model"
+	"github.com/mrmissx/stashbin/database/model"
 )
 
 func RawPageHandler(c echo.Context) error {

diff --git a/response/error.go → utils/response/error.go b/response/error.go → utils/response/error.go
diff --git a/response/html.go → utils/response/html.go b/response/html.go → utils/response/html.go
diff --git a/response/json.go → utils/response/json.go b/response/json.go → utils/response/json.go