From 02e0b6fafd68a77717b19def50d2dfea81f3fb51 Mon Sep 17 00:00:00 2001 From: Iwasaki Yudai Date: Fri, 28 Aug 2015 17:49:25 +0900 Subject: [PATCH] Use `WriteMessage` to simplify --- app/client_context.go | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/app/client_context.go b/app/client_context.go index a71ebea..0d1ebc4 100644 --- a/app/client_context.go +++ b/app/client_context.go @@ -127,23 +127,17 @@ func (context *clientContext) sendInitialize() error { writer.Close() prefs, _ := json.Marshal(context.app.preferences) - writer, err = context.connection.NextWriter(websocket.TextMessage) - if err != nil { - return err - } - writer.Write([]byte{SetPreferences}) - writer.Write(prefs) - writer.Close() + context.connection.WriteMessage( + websocket.TextMessage, + append([]byte{SetPreferences}, prefs...), + ) if context.app.options.EnableReconnect { reconnect, _ := json.Marshal(context.app.options.ReconnectTime) - writer, err = context.connection.NextWriter(websocket.TextMessage) - if err != nil { - return err - } - writer.Write([]byte{SetReconnect}) - writer.Write(reconnect) - writer.Close() + context.connection.WriteMessage( + websocket.TextMessage, + append([]byte{SetReconnect}, reconnect...), + ) } return nil