From 3151443e446d45e9e83a864434288fe183d32cfe Mon Sep 17 00:00:00 2001 From: crusader Date: Fri, 25 Aug 2017 10:57:38 +0900 Subject: [PATCH] =?UTF-8?q?=E3=85=91=ED=9B=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options.go | 19 +++++++++---------- server.go | 10 ++++++---- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/options.go b/options.go index bd4c505..fc4be06 100644 --- a/options.go +++ b/options.go @@ -12,9 +12,6 @@ type ( OnConnectionFunc func(path string, c clients.Client) OnDisconnectedFunc func(c clients.Client) OnPushFunc func() - OnErrorFunc func(ctx *fasthttp.RequestCtx, status int, reason error) - OnCheckOriginFunc func(ctx *fasthttp.RequestCtx) bool - IDGeneratorFunc func(ctx *fasthttp.RequestCtx) string ) const ( @@ -23,7 +20,8 @@ const ( // DefaultReadBufferSize is default value of Read Buffer Size DefaultReadBufferSize = 4096 // DefaultWriteBufferSize is default value of Write Buffer Size - DefaultWriteBufferSize = 4096 + DefaultWriteBufferSize = 4096 + DefaultEnableCompression = false ) var ( @@ -35,13 +33,14 @@ var ( type Options struct { OnConnection OnConnectionFunc OnDisconnected OnDisconnectedFunc - OnCheckOrigin OnCheckOriginFunc - OnError OnErrorFunc - IDGenerator IDGeneratorFunc + OnCheckOrigin func(ctx *fasthttp.RequestCtx) bool + OnError func(ctx *fasthttp.RequestCtx, status int, reason error) + IDGenerator func(ctx *fasthttp.RequestCtx) string - ReadBufferSize int - WriteBufferSize int - HandshakeTimeout time.Duration + HandshakeTimeout time.Duration + ReadBufferSize int + WriteBufferSize int + EnableCompression bool } // Validate validates the configuration diff --git a/server.go b/server.go index ce845e5..7b7d9b5 100644 --- a/server.go +++ b/server.go @@ -30,10 +30,12 @@ func NewServer(o *Options) Server { } s._upgrader = &websocket.Upgrader{ - ReadBufferSize: s._option.ReadBufferSize, - WriteBufferSize: s._option.WriteBufferSize, - HandshakeTimeout: s._option.HandshakeTimeout, - CheckOrigin: s._option.OnCheckOrigin, + HandshakeTimeout: s._option.HandshakeTimeout, + ReadBufferSize: s._option.ReadBufferSize, + WriteBufferSize: s._option.WriteBufferSize, + CheckOrigin: s._option.OnCheckOrigin, + Error: s._option.OnError, + EnableCompression: s._option.EnableCompression, } return s