colin
/
pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert ResetBootstrapState removal on app termination since closing the db explicitly enforces checkout and clearing the side-car wal file

This commit is contained in:
Gani Georgiev 2023-12-09 19:43:03 +02:00
parent 646f90ef43
commit b9f391cf85
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/base.go
View File

@ -557,8 +557,10 @@ func (app *BaseApp) Restart() error {
App: app, App: app,
IsRestart: true, IsRestart: true,
}, func(e *TerminateEvent) error { }, func(e *TerminateEvent) error {
e.App.ResetBootstrapState()
// attempt to restart the bootstrap process in case execve returns an error for some reason // attempt to restart the bootstrap process in case execve returns an error for some reason
defer app.Bootstrap() defer e.App.Bootstrap()
return syscall.Exec(execPath, os.Args, os.Environ()) return syscall.Exec(execPath, os.Args, os.Environ())
}) })

2
pocketbase.go
View File

@ -169,6 +169,8 @@ func (pb *PocketBase) Execute() error {
// trigger cleanups // trigger cleanups
return pb.OnTerminate().Trigger(&core.TerminateEvent{ return pb.OnTerminate().Trigger(&core.TerminateEvent{
App: pb, App: pb,
}, func(e *core.TerminateEvent) error {
return e.App.ResetBootstrapState()
}) })
} }