lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-29 19:01:29 +00:00
Code Issues Releases Activity

Merge pull request #648 from redaready/develop

Browse Source 
update chat example
This commit is contained in:
astaxie 2014-06-14 12:13:50 +08:00
commit 4990d88861
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
example/chat/controllers/ws.go
View File

@ -60,9 +60,9 @@ func (c *connection) readPump() {
break
}
switch op {
case websocket.OpPong:
case websocket.PongMessage:
c.ws.SetReadDeadline(time.Now().Add(readWait))
case websocket.OpText:
case websocket.TextMessage:
message, err := ioutil.ReadAll(r)
if err != nil {
break
@ -89,14 +89,14 @@ func (c *connection) writePump() {
select {
case message, ok := <-c.send:
if !ok {
c.write(websocket.OpClose, []byte{})
c.write(websocket.CloseMessage, []byte{})
return
}
if err := c.write(websocket.OpText, message); err != nil {
if err := c.write(websocket.TextMessage, message); err != nil {
return
}
case <-ticker.C:
if err := c.write(websocket.OpPing, []byte{}); err != nil {
if err := c.write(websocket.PingMessage, []byte{}); err != nil {
return
}
}
@ -149,8 +149,13 @@ type WSController struct {
beego.Controller
}
var upgrader = websocket.Upgrader{
ReadBufferSize: 1024,
WriteBufferSize: 1024,
}
func (this *WSController) Get() {
ws, err := websocket.Upgrade(this.Ctx.ResponseWriter, this.Ctx.Request.Header, nil, 1024, 1024)
ws, err := upgrader.Upgrade(this.Ctx.ResponseWriter, this.Ctx.Request,nil)
if _, ok := err.(websocket.HandshakeError); ok {
http.Error(this.Ctx.ResponseWriter, "Not a websocket handshake", 400)
return