Arrrg
This commit is contained in:
parent
db6f813386
commit
2770f65027
2 changed files with 7 additions and 3 deletions
|
|
@ -433,14 +433,18 @@ func (s *Server) Stop() {
|
|||
s.attachment.Close()
|
||||
}
|
||||
s.closeDatabases()
|
||||
close(s.closeChan)
|
||||
if s.closeChan != nil {
|
||||
close(s.closeChan)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Server) closeDatabases() {
|
||||
if s.userManager != nil {
|
||||
s.userManager.Close()
|
||||
}
|
||||
s.messageCache.Close()
|
||||
if s.messageCache != nil {
|
||||
s.messageCache.Close()
|
||||
}
|
||||
if s.webPush != nil {
|
||||
s.webPush.Close()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4195,7 +4195,7 @@ func newTestConfigWithAuthFile(t *testing.T, databaseURL string) *Config {
|
|||
func newTestServer(t *testing.T, config *Config) *Server {
|
||||
server, err := New(config)
|
||||
require.Nil(t, err)
|
||||
t.Cleanup(server.closeDatabases)
|
||||
t.Cleanup(server.Stop)
|
||||
return server
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue