1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-16 18:06:55 +00:00

Fix the build (move out of internal)

This commit is contained in:
Kane York 2015-11-16 13:28:16 -08:00
parent c38b9b0018
commit 58dd0bd9ee
15 changed files with 4 additions and 5 deletions

View file

@ -1,7 +1,7 @@
package main package main
import ( import (
"bitbucket.org/stendec/frankerfacez/socketserver/internal/server" "bitbucket.org/stendec/frankerfacez/socketserver/server"
"fmt" "fmt"
"github.com/abiosoft/ishell" "github.com/abiosoft/ishell"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"

View file

@ -1,7 +1,7 @@
package main // import "bitbucket.org/stendec/frankerfacez/socketserver/cmd/ffzsocketserver" package main // import "bitbucket.org/stendec/frankerfacez/socketserver/cmd/ffzsocketserver"
import ( import (
"bitbucket.org/stendec/frankerfacez/socketserver/internal/server" "bitbucket.org/stendec/frankerfacez/socketserver/server"
"encoding/json" "encoding/json"
"flag" "flag"
"fmt" "fmt"

View file

@ -1,4 +1,4 @@
package server // import "bitbucket.org/stendec/frankerfacez/socketserver/internal/server" package server // import "bitbucket.org/stendec/frankerfacez/socketserver/server"
import ( import (
"encoding/json" "encoding/json"
@ -220,14 +220,13 @@ func RunSocketConnection(conn *websocket.Conn) {
} }
} }
_, isClose := err.(*websocket.CloseError)
select { select {
case errorChan <- err: case errorChan <- err:
case <-stoppedChan: case <-stoppedChan:
} }
close(errorChan) close(errorChan)
close(clientChan) close(clientChan)
// exit // exit goroutine
}(_errorChan, _clientChan, stoppedChan) }(_errorChan, _clientChan, stoppedChan)
conn.SetPongHandler(func(pongBody string) error { conn.SetPongHandler(func(pongBody string) error {