3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-22 18:52:41 +01:00

server: Add some comments and clean up a bit -- from jlatt/ergonomadic#39 <3

This commit is contained in:
Daniel Oaks 2016-08-14 14:13:01 +10:00
parent 43553390d6
commit a177ca36b1

View File

@ -46,8 +46,12 @@ type Server struct {
} }
var ( var (
SERVER_SIGNALS = []os.Signal{syscall.SIGINT, syscall.SIGHUP, SERVER_SIGNALS = []os.Signal{
syscall.SIGTERM, syscall.SIGQUIT} syscall.SIGINT,
syscall.SIGHUP, // eventually we expect to use HUP to reload config
syscall.SIGTERM,
syscall.SIGQUIT,
}
) )
type clientConn struct { type clientConn struct {
@ -113,6 +117,7 @@ func NewServer(config *Config) *Server {
server.wslisten(config.Server.Wslisten, config.Server.TLSListeners) server.wslisten(config.Server.Wslisten, config.Server.TLSListeners)
} }
// Attempt to clean up when receiving these signals.
signal.Notify(server.signals, SERVER_SIGNALS...) signal.Notify(server.signals, SERVER_SIGNALS...)
// add RPL_ISUPPORT tokens // add RPL_ISUPPORT tokens
@ -181,6 +186,10 @@ func (server *Server) Shutdown() {
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 {
Log.error.Println("Server.Shutdown: error:", err)
}
} }
func (server *Server) Run() { func (server *Server) Run() {