From 662e01d9f8c101340ebc07947769e0966a03647d Mon Sep 17 00:00:00 2001
From: xjasonlyu <xjasonlyu@gmail.com>
Date: Mon, 23 May 2022 20:21:17 +0800
Subject: [PATCH] refactor main

---
 Dockerfile         |  5 ++++-
 cmd/server/main.go | 38 ++++++++++++++++++++++++++++----------
 engine/engine.go   | 20 ++++----------------
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8a43423..6fc4838 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,9 @@ ENV GIN_MODE=release
 ENV PORT=8080
 ENV TOKEN=""
 ENV DSN=""
-ENV AUTO_MIGRATE=1
+ENV DB_MAX_IDLE_CONNS=0
+ENV DB_MAX_OPEN_CONNS=0
+ENV DB_PREPARED_STMT=0
+ENV DB_AUTO_MIGRATE=1
 
 ENTRYPOINT ["/javtube-server"]
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 8ce3119..0c20c85 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -12,23 +12,34 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/peterbourgon/ff/v3"
 
+	"github.com/javtube/javtube-sdk-go/database"
 	"github.com/javtube/javtube-sdk-go/engine"
 	V "github.com/javtube/javtube-sdk-go/internal/constant"
 	"github.com/javtube/javtube-sdk-go/route"
 	"github.com/javtube/javtube-sdk-go/route/validator"
 )
 
+const defaultRequestTimeout = 2 * time.Minute
+
 var (
 	opts = new(options)
 	flag = goflag.NewFlagSet("", goflag.ExitOnError)
 )
 
 type options struct {
-	bind        string
-	port        string
-	token       string
-	dsn         string
-	autoMigrate bool
+	// base options
+	bind  string
+	port  string
+	token string
+	dsn   string
+
+	// database options
+	dbMaxIdleConns int
+	dbMaxOpenConns int
+	dbAutoMigrate  bool
+	dbPreparedStmt bool
+
+	// version flag
 	versionFlag bool
 }
 
@@ -41,7 +52,10 @@ func init() {
 	flag.StringVar(&opts.port, "port", "8080", "Port number of server")
 	flag.StringVar(&opts.token, "token", "", "Token to access server")
 	flag.StringVar(&opts.dsn, "dsn", "", "Database Service Name")
-	flag.BoolVar(&opts.autoMigrate, "auto-migrate", false, "Database auto migration")
+	flag.IntVar(&opts.dbMaxIdleConns, "db-max-idle-conns", 0, "Database max idle connections")
+	flag.IntVar(&opts.dbMaxOpenConns, "db-max-open-conns", 0, "Database max open connections")
+	flag.BoolVar(&opts.dbAutoMigrate, "db-auto-migrate", false, "Database auto migration")
+	flag.BoolVar(&opts.dbPreparedStmt, "db-prepared-stmt", false, "Database prepared statement")
 	flag.BoolVar(&opts.versionFlag, "v", false, "Show version")
 	ff.Parse(flag, os.Args[1:], ff.WithEnvVarNoPrefix())
 }
@@ -57,15 +71,19 @@ func main() {
 		showVersionAndExit()
 	}
 
-	app, err := engine.New(&engine.Options{
-		DSN:     opts.dsn,
-		Timeout: 2 * time.Minute,
+	db, err := database.Open(&database.Config{
+		DSN:                  opts.dsn,
+		PreparedStmt:         opts.dbPreparedStmt,
+		MaxIdleConns:         opts.dbMaxIdleConns,
+		MaxOpenConns:         opts.dbMaxOpenConns,
+		DisableAutomaticPing: true,
 	})
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	if err = app.AutoMigrate(opts.autoMigrate); err != nil {
+	app := engine.New(db, defaultRequestTimeout)
+	if err = app.AutoMigrate(opts.dbAutoMigrate); err != nil {
 		log.Fatal(err)
 	}
 
diff --git a/engine/engine.go b/engine/engine.go
index d15ecf8..be0cdbf 100644
--- a/engine/engine.go
+++ b/engine/engine.go
@@ -35,24 +35,12 @@ type Engine struct {
 	actorProviders map[string]javtube.ActorProvider
 }
 
-func New(opts *Options) (engine *Engine, err error) {
-	var db *gorm.DB
-	if db, err = openDB(opts.DSN); err != nil {
-		return
-	}
-
-	if !opts.DisableAutomaticPing {
-		if pinger, ok := db.ConnPool.(interface{ Ping() error }); ok {
-			go pinger.Ping() // Async ping.
-		}
-	}
-
-	engine = &Engine{
+func New(db *gorm.DB, timeout time.Duration) *Engine {
+	return &Engine{
 		db:             db,
-		actorProviders: initActorProviders(opts.Timeout),
-		movieProviders: initMovieProviders(opts.Timeout),
+		actorProviders: initActorProviders(timeout),
+		movieProviders: initMovieProviders(timeout),
 	}
-	return
 }
 
 // initActorProviders initializes actor providers.