diff --git a/backend/ssgrpc/client.go b/backend/ssgrpc/client.go index 9362e5d..04f67a8 100644 --- a/backend/ssgrpc/client.go +++ b/backend/ssgrpc/client.go @@ -1,8 +1,8 @@ package ssgrpc import ( - "google.golang.org/grpc" "github.com/raz-varren/sacrificial-socket/backend/ssgrpc/transport" + "google.golang.org/grpc" //"sync" ) diff --git a/backend/ssgrpc/cred.go b/backend/ssgrpc/cred.go index 8419372..812c11d 100644 --- a/backend/ssgrpc/cred.go +++ b/backend/ssgrpc/cred.go @@ -1,9 +1,9 @@ package ssgrpc import ( - "golang.org/x/net/context" "github.com/raz-varren/sacrificial-socket/backend/ssgrpc/token" "github.com/raz-varren/sacrificial-socket/log" + "golang.org/x/net/context" "sync" "time" ) diff --git a/backend/ssgrpc/server.go b/backend/ssgrpc/server.go index dcd6db0..d620ab2 100644 --- a/backend/ssgrpc/server.go +++ b/backend/ssgrpc/server.go @@ -3,12 +3,12 @@ package ssgrpc import ( "encoding/json" "errors" - "golang.org/x/net/context" - "google.golang.org/grpc/metadata" ss "github.com/raz-varren/sacrificial-socket" "github.com/raz-varren/sacrificial-socket/backend/ssgrpc/token" "github.com/raz-varren/sacrificial-socket/backend/ssgrpc/transport" "github.com/raz-varren/sacrificial-socket/log" + "golang.org/x/net/context" + "google.golang.org/grpc/metadata" "strings" "sync" ) diff --git a/backend/ssgrpc/ssgrpc.go b/backend/ssgrpc/ssgrpc.go index 0af6739..ef2bedb 100644 --- a/backend/ssgrpc/ssgrpc.go +++ b/backend/ssgrpc/ssgrpc.go @@ -2,13 +2,13 @@ package ssgrpc import ( "encoding/json" + ss "github.com/raz-varren/sacrificial-socket" + "github.com/raz-varren/sacrificial-socket/backend/ssgrpc/transport" + "github.com/raz-varren/sacrificial-socket/log" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "net" - ss "github.com/raz-varren/sacrificial-socket" - "github.com/raz-varren/sacrificial-socket/backend/ssgrpc/transport" - "github.com/raz-varren/sacrificial-socket/log" "strings" "sync" "time" @@ -44,7 +44,7 @@ func NewBackend(tlsKeyFile, tlsCertFile, grpcHostPort string, sharedKey []byte, } } -//NewInsecureBackend returns a GRPCMHB that will use no encryption or authentication to connect to the +//NewInsecureBackend returns a GRPCMHB that will use no encryption or authentication to connect to the //peers in peerList // //It is highly discouraged to use this for production systems, as all data will be sent in clear diff --git a/backend/ssmongo/ssmongo.go b/backend/ssmongo/ssmongo.go index b45ce83..a02677f 100644 --- a/backend/ssmongo/ssmongo.go +++ b/backend/ssmongo/ssmongo.go @@ -2,11 +2,11 @@ package ssmongo import ( "encoding/json" + ss "github.com/raz-varren/sacrificial-socket" + "github.com/raz-varren/sacrificial-socket/log" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "io" - ss "github.com/raz-varren/sacrificial-socket" - "github.com/raz-varren/sacrificial-socket/log" "sync" "time" ) @@ -14,13 +14,13 @@ import ( //MMHB implements ss.MultihomeBackend and uses MongoDB to syncronize between //multiple machines running ss.SocketServer type MMHB struct { - session *mgo.Session - serverC *mgo.Collection - roomcastC *mgo.Collection - broadcastC *mgo.Collection - server backendServer + session *mgo.Session + serverC *mgo.Collection + roomcastC *mgo.Collection + broadcastC *mgo.Collection + server backendServer pollFrequency time.Duration - l *sync.RWMutex + l *sync.RWMutex } //NewMongoDBBackend returns a new instance of MMHB which satisfies the ss.MultihomeBackend interface. @@ -46,13 +46,13 @@ func NewBackend(mongoURL, serverName, serverGroup string, pollFrequency time.Dur } return &MMHB{ - session: m, - serverC: db.C("ss.activeServers"), - roomcastC: db.C("ss.roomcasts"), - broadcastC: db.C("ss.broadcasts"), - server: s, + session: m, + serverC: db.C("ss.activeServers"), + roomcastC: db.C("ss.roomcasts"), + broadcastC: db.C("ss.broadcasts"), + server: s, pollFrequency: pollFrequency, - l: &sync.RWMutex{}, + l: &sync.RWMutex{}, } } diff --git a/examples/not-so-simple-examples/grpc-multihome/main.go b/examples/not-so-simple-examples/grpc-multihome/main.go index 448d718..e349b0c 100644 --- a/examples/not-so-simple-examples/grpc-multihome/main.go +++ b/examples/not-so-simple-examples/grpc-multihome/main.go @@ -3,11 +3,11 @@ package main import ( "encoding/json" "flag" + "github.com/raz-varren/sacrificial-socket" + "github.com/raz-varren/sacrificial-socket/backend/ssgrpc" "log" "net/http" "os" - "github.com/raz-varren/sacrificial-socket" - "github.com/raz-varren/sacrificial-socket/backend/ssgrpc" "strings" //"time" ) @@ -101,20 +101,20 @@ func EchoJSON(s *ss.Socket, data []byte) { var m message err := json.Unmarshal(data, &m) check(err) - + s.Emit("echojson", m) } func Join(s *ss.Socket, data []byte) { d := string(data) s.Join(d) - s.Emit("echo", "joined room:" + d) + s.Emit("echo", "joined room:"+d) } func Leave(s *ss.Socket, data []byte) { d := string(data) s.Leave(d) - s.Emit("echo", "left room:" + d) + s.Emit("echo", "left room:"+d) } func Roomcast(s *ss.Socket, data []byte) { @@ -129,7 +129,7 @@ func RoomcastBin(s *ss.Socket, data []byte) { var r roomcast err := json.Unmarshal(data, &r) check(err) - + s.Roomcast(r.Room, "roomcastbin", []byte(r.Data)) } @@ -141,12 +141,11 @@ func RoomcastJSON(s *ss.Socket, data []byte) { s.Roomcast(r.Room, "roomcastjson", r) } - func Broadcast(s *ss.Socket, data []byte) { s.Broadcast("broadcast", string(data)) } -func BroadcastBin(s *ss.Socket, data []byte){ +func BroadcastBin(s *ss.Socket, data []byte) { s.Broadcast("broadcastbin", data) } @@ -154,7 +153,7 @@ func BroadcastJSON(s *ss.Socket, data []byte) { var m message err := json.Unmarshal(data, &m) check(err) - + s.Broadcast("broadcastjson", m) } diff --git a/examples/simple-examples/chat/main.go b/examples/simple-examples/chat/main.go index 83b3a99..1499337 100644 --- a/examples/simple-examples/chat/main.go +++ b/examples/simple-examples/chat/main.go @@ -2,9 +2,9 @@ package main import ( "encoding/json" + ss "github.com/raz-varren/sacrificial-socket" "log" "net/http" - ss "github.com/raz-varren/sacrificial-socket" ) func main() { diff --git a/server.go b/server.go index 4a6080a..2cf1876 100644 --- a/server.go +++ b/server.go @@ -8,12 +8,12 @@ Sacrificial-Socket also has a MultihomeBackend interface for syncronizing broadc package ss import ( + "github.com/raz-varren/sacrificial-socket/log" "golang.org/x/net/websocket" "io" "net/http" "os" "os/signal" - "github.com/raz-varren/sacrificial-socket/log" "sync" "syscall" ) @@ -158,14 +158,13 @@ func (serv *SocketServer) loop(ws *websocket.Conn) { return } - eventName := "" contentIdx := 0 for idx, chr := range msg { if chr == startOfDataByte { eventName = string(msg[:idx]) - contentIdx = idx+1 + contentIdx = idx + 1 break } } diff --git a/server_test.go b/server_test.go index af208d9..fadebdb 100644 --- a/server_test.go +++ b/server_test.go @@ -2,10 +2,10 @@ package ss_test import ( "encoding/json" + "github.com/raz-varren/sacrificial-socket" "log" "net/http" "os" - "github.com/raz-varren/sacrificial-socket" ) func ExampleNewServer() { diff --git a/socket.go b/socket.go index 7a9ccc4..27fc691 100644 --- a/socket.go +++ b/socket.go @@ -3,9 +3,9 @@ package ss import ( "bytes" "encoding/json" - "golang.org/x/net/websocket" "github.com/raz-varren/sacrificial-socket/log" "github.com/raz-varren/sacrificial-socket/tools" + "golang.org/x/net/websocket" "sync" )