perf(db): release database before exit
This commit is contained in:
parent
b604e21c69
commit
3231c3d930
@ -19,6 +19,7 @@ var AdminCmd = &cobra.Command{
|
|||||||
Short: "Show admin user's info and some operations about admin user's password",
|
Short: "Show admin user's info and some operations about admin user's password",
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
Init()
|
Init()
|
||||||
|
defer Release()
|
||||||
admin, err := op.GetAdmin()
|
admin, err := op.GetAdmin()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Log.Errorf("failed get admin user: %+v", err)
|
utils.Log.Errorf("failed get admin user: %+v", err)
|
||||||
@ -57,6 +58,7 @@ var ShowTokenCmd = &cobra.Command{
|
|||||||
Short: "Show admin token",
|
Short: "Show admin token",
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
Init()
|
Init()
|
||||||
|
defer Release()
|
||||||
token := setting.GetStr(conf.Token)
|
token := setting.GetStr(conf.Token)
|
||||||
utils.Log.Infof("Admin token: %s", token)
|
utils.Log.Infof("Admin token: %s", token)
|
||||||
},
|
},
|
||||||
@ -64,6 +66,7 @@ var ShowTokenCmd = &cobra.Command{
|
|||||||
|
|
||||||
func setAdminPassword(pwd string) {
|
func setAdminPassword(pwd string) {
|
||||||
Init()
|
Init()
|
||||||
|
defer Release()
|
||||||
admin, err := op.GetAdmin()
|
admin, err := op.GetAdmin()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Log.Errorf("failed get admin user: %+v", err)
|
utils.Log.Errorf("failed get admin user: %+v", err)
|
||||||
|
@ -15,6 +15,7 @@ var Cancel2FACmd = &cobra.Command{
|
|||||||
Short: "Delete 2FA of admin user",
|
Short: "Delete 2FA of admin user",
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
Init()
|
Init()
|
||||||
|
defer Release()
|
||||||
admin, err := op.GetAdmin()
|
admin, err := op.GetAdmin()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Log.Errorf("failed to get admin user: %+v", err)
|
utils.Log.Errorf("failed to get admin user: %+v", err)
|
||||||
|
@ -7,6 +7,7 @@ import (
|
|||||||
|
|
||||||
"github.com/alist-org/alist/v3/internal/bootstrap"
|
"github.com/alist-org/alist/v3/internal/bootstrap"
|
||||||
"github.com/alist-org/alist/v3/internal/bootstrap/data"
|
"github.com/alist-org/alist/v3/internal/bootstrap/data"
|
||||||
|
"github.com/alist-org/alist/v3/internal/db"
|
||||||
"github.com/alist-org/alist/v3/pkg/utils"
|
"github.com/alist-org/alist/v3/pkg/utils"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
@ -19,6 +20,10 @@ func Init() {
|
|||||||
bootstrap.InitIndex()
|
bootstrap.InitIndex()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func Release() {
|
||||||
|
db.Close()
|
||||||
|
}
|
||||||
|
|
||||||
var pid = -1
|
var pid = -1
|
||||||
var pidFile string
|
var pidFile string
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ the address is defined in config file`,
|
|||||||
signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
|
signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
|
||||||
<-quit
|
<-quit
|
||||||
utils.Log.Println("Shutdown server...")
|
utils.Log.Println("Shutdown server...")
|
||||||
|
Release()
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
|
@ -31,6 +31,7 @@ var disableStorageCmd = &cobra.Command{
|
|||||||
}
|
}
|
||||||
mountPath := args[0]
|
mountPath := args[0]
|
||||||
Init()
|
Init()
|
||||||
|
defer Release()
|
||||||
storage, err := db.GetStorageByMountPath(mountPath)
|
storage, err := db.GetStorageByMountPath(mountPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Log.Errorf("failed to query storage: %+v", err)
|
utils.Log.Errorf("failed to query storage: %+v", err)
|
||||||
@ -89,6 +90,7 @@ var listStorageCmd = &cobra.Command{
|
|||||||
Short: "List all storages",
|
Short: "List all storages",
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
Init()
|
Init()
|
||||||
|
defer Release()
|
||||||
storages, _, err := db.GetStorages(1, -1)
|
storages, _, err := db.GetStorages(1, -1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Log.Errorf("failed to query storages: %+v", err)
|
utils.Log.Errorf("failed to query storages: %+v", err)
|
||||||
|
@ -31,3 +31,17 @@ func AutoMigrate(dst ...interface{}) error {
|
|||||||
func GetDb() *gorm.DB {
|
func GetDb() *gorm.DB {
|
||||||
return db
|
return db
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func Close() {
|
||||||
|
log.Info("closing db")
|
||||||
|
sqlDB, err := db.DB()
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("failed to get db: %s", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = sqlDB.Close()
|
||||||
|
if err != nil {
|
||||||
|
log.Errorf("failed to close db: %s", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user