|
@@ -9,7 +9,6 @@ import (
|
9
|
9
|
"net/http"
|
10
|
10
|
"os"
|
11
|
11
|
"strings"
|
12
|
|
- "sync"
|
13
|
12
|
"time"
|
14
|
13
|
|
15
|
14
|
"github.com/gorilla/websocket"
|
|
@@ -112,12 +111,10 @@ func (nl *NetListener) serve() {
|
112
|
111
|
// WSListener is a listener for IRC-over-websockets (initially HTTP, then upgraded to a
|
113
|
112
|
// different application protocol that provides a message-based API, possibly with TLS)
|
114
|
113
|
type WSListener struct {
|
115
|
|
- sync.Mutex // tier 1
|
116
|
114
|
listener *utils.ReloadableListener
|
117
|
115
|
httpServer *http.Server
|
118
|
116
|
server *Server
|
119
|
117
|
addr string
|
120
|
|
- config utils.ListenerConfig
|
121
|
118
|
}
|
122
|
119
|
|
123
|
120
|
func NewWSListener(server *Server, addr string, listener *utils.ReloadableListener, config utils.ListenerConfig) (result *WSListener, err error) {
|
|
@@ -125,7 +122,6 @@ func NewWSListener(server *Server, addr string, listener *utils.ReloadableListen
|
125
|
122
|
listener: listener,
|
126
|
123
|
server: server,
|
127
|
124
|
addr: addr,
|
128
|
|
- config: config,
|
129
|
125
|
}
|
130
|
126
|
result.httpServer = &http.Server{
|
131
|
127
|
Handler: http.HandlerFunc(result.handle),
|