Merge branch 'master' into next

This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-10-31 16:28:31 -03:00
7 changed files with 53 additions and 16 deletions

View File

@@ -101,6 +101,7 @@ func Register(extend HandlerExtender) {
IdleTimeout: 30 * time.Second,
ReadHeaderTimeout: 5 * time.Second,
}
if config.UseLetsEncrypt {
certManager := autocert.Manager{
Prompt: autocert.AcceptTOS,
@@ -127,7 +128,6 @@ func Register(extend HandlerExtender) {
log.Println("Listening on port " + config.PortNumber)
log.Fatal(httpServer.ListenAndServe())
}
}
func RegisterEvents(s *socketio.Server) {