fix(db) EE-2425 http-disabled flag does not work (#6446)

Co-authored-by: Simon Meng <simon.meng@portainer.io>
This commit is contained in:
cong meng
2022-01-25 09:32:24 +13:00
committed by GitHub
parent 234b6fb369
commit a74238bf33

View File

@@ -104,11 +104,6 @@ func initDataStore(flags *portainer.CLIFlags, secretKey []byte, fileService port
if isNew {
// from MigrateData
store.VersionService.StoreDBVersion(portainer.DBVersion)
err := updateSettingsFromFlags(store, flags)
if err != nil {
logrus.Fatalf("Failed updating settings from flags: %v", err)
}
} else {
storedVersion, err := store.VersionService.DBVersion()
if err != nil {
@@ -122,6 +117,11 @@ func initDataStore(flags *portainer.CLIFlags, secretKey []byte, fileService port
}
}
err = updateSettingsFromFlags(store, flags)
if err != nil {
logrus.Fatalf("Failed updating settings from flags: %v", err)
}
// this is for the db restore functionality - needs more tests.
go func() {
<-shutdownCtx.Done()