a/realize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

websocket communication fixed

Browse Source
This commit is contained in:
asoseil 2017-10-15 21:36:14 +02:00
parent 9dd5cc1a74
commit 929738d303
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server.go
View File

@ -34,13 +34,13 @@ type Server struct {
func (s *Server) projects(c echo.Context) error { func (s *Server) projects(c echo.Context) error {
websocket.Handler(func(ws *websocket.Conn) { websocket.Handler(func(ws *websocket.Conn) {
defer ws.Close() defer ws.Close()
msg, _ := json.Marshal(s.parent.Schema) msg, _ := json.Marshal(s.parent)
err := websocket.Message.Send(ws, string(msg)) err := websocket.Message.Send(ws, string(msg))
go func() { go func() {
for { for {
select { select {
case <-s.parent.sync: case <-s.parent.sync:
msg, _ := json.Marshal(s.parent.Schema) msg, _ := json.Marshal(s.parent)
err = websocket.Message.Send(ws, string(msg)) err = websocket.Message.Send(ws, string(msg))
if err != nil { if err != nil {
break break
@ -52,12 +52,13 @@ func (s *Server) projects(c echo.Context) error {
// Read // Read
text := "" text := ""
err := websocket.Message.Receive(ws, &text) err := websocket.Message.Receive(ws, &text)
fmt.Println("receive")
if err != nil { if err != nil {
break break
} else { } else {
err := json.Unmarshal([]byte(text), &s.parent.Schema) err := json.Unmarshal([]byte(text), &s.parent)
if err != nil { if err == nil {
s.parent.Settings.record(s.parent.Settings) s.parent.Settings.record(s.parent)
break break
} }
} }
@ -129,6 +130,7 @@ func (s *Server) start(p *cli.Context) (err error) {
//websocket //websocket
e.GET("/ws", s.projects) e.GET("/ws", s.projects)
e.HideBanner = true
go e.Start(string(s.parent.Server.Host) + ":" + strconv.Itoa(s.parent.Server.Port)) go e.Start(string(s.parent.Server.Host) + ":" + strconv.Itoa(s.parent.Server.Port))
_, err = s.openURL("http://" + string(s.parent.Server.Host) + ":" + strconv.Itoa(s.parent.Server.Port)) _, err = s.openURL("http://" + string(s.parent.Server.Host) + ":" + strconv.Itoa(s.parent.Server.Port))
if err != nil { if err != nil {