GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-14 07:59:31 +01:00
Code Issues Projects Releases Wiki Activity

server: Close store properly, on shutdown

Browse Source
This commit is contained in:
Daniel Oaks 2016-09-05 19:39:16 +10:00
parent 6e96a175d6
commit 4cb196f50a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
irc/server.go
View File

@ -90,7 +90,6 @@ func NewServer(config *Config) *Server {
if err != nil { if err != nil {
log.Fatal(fmt.Sprintf("Failed to open datastore: %s", err.Error())) log.Fatal(fmt.Sprintf("Failed to open datastore: %s", err.Error()))
} }
defer db.Close()
server.store = *db server.store = *db
// load password manager // load password manager
@ -237,13 +236,16 @@ func (server *Server) loadChannels() {
} }
func (server *Server) Shutdown() { func (server *Server) Shutdown() {
server.db.Close() //TODO(dan): Make sure we disallow new nicks
for _, client := range server.clients.byNick { for _, client := range server.clients.byNick {
client.Notice("Server is shutting down") client.Notice("Server is shutting down")
} }
if err := server.db.Close(); err != nil { if err := server.db.Close(); err != nil {
Log.error.Println("Server.Shutdown: error:", err) Log.error.Println("Server.Shutdown db.Close: error:", err)
}
if err := server.store.Close(); err != nil {
Log.error.Println("Server.Shutdown store.Close: error:", err)
} }
} }