mirror of
https://github.com/0xJacky/nginx-ui.git
synced 2025-05-11 10:25:52 +02:00
fix: bug fix
Some checks are pending
Build / build_app (push) Waiting to run
Build / build (386, linux) (push) Blocked by required conditions
Build / build (386, windows) (push) Blocked by required conditions
Build / build (amd64, darwin) (push) Blocked by required conditions
Build / build (amd64, linux) (push) Blocked by required conditions
Build / build (amd64, windows) (push) Blocked by required conditions
Build / build (arm, 5, linux) (push) Blocked by required conditions
Build / build (arm, 6, linux) (push) Blocked by required conditions
Build / build (arm, 7, linux) (push) Blocked by required conditions
Build / build (arm64, darwin) (push) Blocked by required conditions
Build / build (arm64, linux) (push) Blocked by required conditions
Build / build (arm64, windows) (push) Blocked by required conditions
Build / build (loong64, linux) (push) Blocked by required conditions
Build / build (mips, linux) (push) Blocked by required conditions
Build / build (mips64, linux) (push) Blocked by required conditions
Build / build (mips64le, linux) (push) Blocked by required conditions
Build / build (mipsle, linux) (push) Blocked by required conditions
Build / build (riscv64, linux) (push) Blocked by required conditions
Build / docker-build (push) Blocked by required conditions
CodeQL / Analyze (go) (push) Waiting to run
CodeQL / Analyze (javascript-typescript) (push) Waiting to run
Some checks are pending
Build / build_app (push) Waiting to run
Build / build (386, linux) (push) Blocked by required conditions
Build / build (386, windows) (push) Blocked by required conditions
Build / build (amd64, darwin) (push) Blocked by required conditions
Build / build (amd64, linux) (push) Blocked by required conditions
Build / build (amd64, windows) (push) Blocked by required conditions
Build / build (arm, 5, linux) (push) Blocked by required conditions
Build / build (arm, 6, linux) (push) Blocked by required conditions
Build / build (arm, 7, linux) (push) Blocked by required conditions
Build / build (arm64, darwin) (push) Blocked by required conditions
Build / build (arm64, linux) (push) Blocked by required conditions
Build / build (arm64, windows) (push) Blocked by required conditions
Build / build (loong64, linux) (push) Blocked by required conditions
Build / build (mips, linux) (push) Blocked by required conditions
Build / build (mips64, linux) (push) Blocked by required conditions
Build / build (mips64le, linux) (push) Blocked by required conditions
Build / build (mipsle, linux) (push) Blocked by required conditions
Build / build (riscv64, linux) (push) Blocked by required conditions
Build / docker-build (push) Blocked by required conditions
CodeQL / Analyze (go) (push) Waiting to run
CodeQL / Analyze (javascript-typescript) (push) Waiting to run
This commit is contained in:
parent
f4b32d9538
commit
32fdc627bc
4 changed files with 19 additions and 30 deletions
|
@ -9,7 +9,6 @@ import (
|
|||
"path"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"sync"
|
||||
|
||||
"github.com/0xJacky/Nginx-UI/internal/analytic"
|
||||
"github.com/0xJacky/Nginx-UI/internal/cache"
|
||||
|
@ -45,6 +44,7 @@ func Boot(ctx context.Context) {
|
|||
InitCryptoSecret,
|
||||
validation.Init,
|
||||
func() {
|
||||
InitDatabase(ctx)
|
||||
cache.Init(ctx)
|
||||
},
|
||||
CheckAndCleanupOTA,
|
||||
|
@ -52,7 +52,6 @@ func Boot(ctx context.Context) {
|
|||
|
||||
syncs := []func(ctx context.Context){
|
||||
analytic.RecordServerAnalytic,
|
||||
InitDatabase,
|
||||
}
|
||||
|
||||
for _, v := range async {
|
||||
|
@ -89,20 +88,6 @@ func recovery() {
|
|||
}
|
||||
}
|
||||
|
||||
var (
|
||||
installChan = make(chan struct{})
|
||||
dbInited = sync.WaitGroup{}
|
||||
)
|
||||
|
||||
func init() {
|
||||
dbInited.Add(1)
|
||||
}
|
||||
|
||||
func PostInstall() {
|
||||
installChan <- struct{}{}
|
||||
dbInited.Wait()
|
||||
}
|
||||
|
||||
func InitDatabase(ctx context.Context) {
|
||||
cModel.ResolvedModels()
|
||||
// Skip install
|
||||
|
@ -110,16 +95,13 @@ func InitDatabase(ctx context.Context) {
|
|||
skipInstall()
|
||||
}
|
||||
|
||||
if cSettings.AppSettings.JwtSecret == "" {
|
||||
<-installChan
|
||||
if cSettings.AppSettings.JwtSecret != "" {
|
||||
db := cosy.InitDB(sqlite.Open(path.Dir(cSettings.ConfPath), settings.DatabaseSettings))
|
||||
model.Use(db)
|
||||
query.Init(db)
|
||||
|
||||
InitAfterDatabase(ctx)
|
||||
}
|
||||
|
||||
db := cosy.InitDB(sqlite.Open(path.Dir(cSettings.ConfPath), settings.DatabaseSettings))
|
||||
model.Use(db)
|
||||
query.Init(db)
|
||||
|
||||
InitAfterDatabase(ctx)
|
||||
dbInited.Done()
|
||||
}
|
||||
|
||||
func InitNodeSecret() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue