oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-02 07:58:31 +00:00
Code Wiki Activity

Write to logfile, cut some of logging

Browse source
This commit is contained in:
Kane York 2015-10-28 17:31:44 -07:00
parent 014e7bc5e5
commit 6c422b8782
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
socketserver/internal/server/handlecore.go
View file

@ -102,7 +102,6 @@ func ServeWebsocketOrCatbag(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(w, "error: %v", err)
return
}
fmt.Println("upgraded!")
HandleSocketConnection(conn)
return
@ -113,6 +112,10 @@ func ServeWebsocketOrCatbag(w http.ResponseWriter, r *http.Request) {
var CloseGotBinaryMessage = websocket.CloseError{Code: websocket.CloseUnsupportedData, Text: "got binary packet"}
var CloseGotMessageId0 = websocket.CloseError{Code: websocket.ClosePolicyViolation, Text: "got messageid 0"}
var CloseFirstMessageNotHello = websocket.CloseError{
Text: "Error - the first message sent must be a 'hello'",
Code: websocket.ClosePolicyViolation,
}
// Handle a new websocket connection from a FFZ client.
// This runs in a goroutine started by net/http.
@ -198,10 +201,7 @@ RunLoop:
case msg := <-clientChan:
if client.Version == "" && msg.Command != HelloCommand {
log.Println("error - first message wasn't hello from", conn.RemoteAddr(), "-", msg)
CloseConnection(conn, &websocket.CloseError{
Text: "Error - the first message sent must be a 'hello'",
Code: websocket.ClosePolicyViolation,
})
CloseConnection(conn, &CloseFirstMessageNotHello)
break RunLoop
}
@ -244,7 +244,9 @@ func CallHandler(handler CommandHandler, conn *websocket.Conn, client *ClientInf
}
func CloseConnection(conn *websocket.Conn, closeMsg *websocket.CloseError) {
fmt.Println("Terminating connection with", conn.RemoteAddr(), "-", closeMsg.Text)
if closeMsg != &CloseFirstMessageNotHello {
log.Println("Terminating connection with", conn.RemoteAddr(), "-", closeMsg.Text)
}
conn.WriteControl(websocket.CloseMessage, websocket.FormatCloseMessage(closeMsg.Code, closeMsg.Text), time.Now().Add(2*time.Minute))
conn.Close()
}
@ -254,7 +256,6 @@ func SendMessage(conn *websocket.Conn, msg ClientMessage) {
if err != nil {
panic(fmt.Sprintf("failed to marshal: %v %v", err, msg))
}
fmt.Println(string(packet))
conn.WriteMessage(messageType, packet)
}