overflow_backup_2018_0455/overflow_gateway_probe
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2017-11-29 20:46:56 +09:00
parent 7b033878f0
commit 258d739f17
7 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/server_handlers.go
View File

@ -1,6 +1,7 @@
package server package server
import ( import (
cwf "git.loafle.net/commons_go/websocket_fasthttp"
oogws "git.loafle.net/overflow/overflow_gateway_websocket/server" oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
) )
@ -17,16 +18,16 @@ type ServerHandlers struct {
// Init invoked before the server is started // Init invoked before the server is started
// If you override ths method, must call // If you override ths method, must call
func (sh *ServerHandlers) Init() error { func (sh *ServerHandlers) Init(serverCTX cwf.ServerContext) error {
if err := sh.ServerHandler.Init(); nil != err { if err := sh.ServerHandler.Init(serverCTX); nil != err {
return err return err
} }
return nil return nil
} }
func (sh *ServerHandlers) OnStart() { func (sh *ServerHandlers) OnStart(serverCTX cwf.ServerContext) {
sh.ServerHandler.OnStart() sh.ServerHandler.OnStart(serverCTX)
} }
@ -41,9 +42,9 @@ func (sh *ServerHandlers) CheckOrigin(ctx *fasthttp.RequestCtx) bool {
return true return true
} }
func (sh *ServerHandlers) OnStop() { func (sh *ServerHandlers) OnStop(serverCTX cwf.ServerContext) {
sh.ServerHandler.OnStop() sh.ServerHandler.OnStop(serverCTX)
} }
func (sh *ServerHandlers) Validate() { func (sh *ServerHandlers) Validate() {

7
servlet/data/data.go
View File

@ -17,13 +17,13 @@ var (
cfg *oosc.Servlet cfg *oosc.Servlet
) )
func ServletInit(sh oogws.ServerHandler) { func ServletInit(sh oogws.ServerHandler) {
cfg = oogwc.Config.Servlets[Name] cfg = oogwc.Config.Servlets[Name]
if nil == cfg { if nil == cfg {
logging.Logger().Panic(fmt.Sprintf("Webapp: config of servlet[%s] is not exist", Name)) logging.Logger().Panic(fmt.Sprintf("Webapp: config of servlet[%s] is not exist", Name))
} }
rpcGH := newRPCGatewayHandler() rpcGH := newGatewayRPCHandler()
sh.RegisterRPCGatewayServlet(Name, rpcGH) sh.RegisterRPCGatewayServlet(Name, rpcGH)
//sub := newSubscriberHandler(rpcSH) //sub := newSubscriberHandler(rpcSH)
@ -31,7 +31,6 @@ func ServletInit(sh oogws.ServerHandler) {
//sh.RegisterSubscriber(sub) //sh.RegisterSubscriber(sub)
} }
func ServletDestroy() {
func ServletDestroy() {
} }

17
servlet/data/rpc_gateway_handlers.go → servlet/data/gateway_rpc_handlers.go
View File

@ -4,27 +4,28 @@ import (
"fmt" "fmt"
"git.loafle.net/commons_go/logging" "git.loafle.net/commons_go/logging"
cwf "git.loafle.net/commons_go/websocket_fasthttp"
"git.loafle.net/overflow/overflow_gateway_websocket/config" "git.loafle.net/overflow/overflow_gateway_websocket/config"
"git.loafle.net/overflow/overflow_gateway_websocket/rpc" "git.loafle.net/overflow/overflow_gateway_websocket/rpc"
jwt "github.com/dgrijalva/jwt-go" jwt "github.com/dgrijalva/jwt-go"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
) )
func newRPCGatewayHandler() rpc.RPCGatewayHandler { func newGatewayRPCHandler() rpc.GatewayRPCHandler {
gh := &RPCGatewayHandlers{} gh := &GatewayRPCHandlers{}
return gh return gh
} }
type RPCGatewayHandlers struct { type GatewayRPCHandlers struct {
rpc.RPCGatewayHandlers rpc.GatewayRPCHandlers
} }
func (sh *RPCGatewayHandlers) Init() error { func (sh *GatewayRPCHandlers) Init(serverCTX cwf.ServerContext) error {
return nil return nil
} }
func (sh *RPCGatewayHandlers) Handshake(ctx *fasthttp.RequestCtx) (id string, extensionsHeader *fasthttp.ResponseHeader) { func (sh *GatewayRPCHandlers) Handshake(serverCTX cwf.ServerContext, ctx *fasthttp.RequestCtx) (id string, extensionsHeader *fasthttp.ResponseHeader) {
var ok bool var ok bool
// tokenString := string(soc.Conn().Headers().Cookie("AuthToken")) // tokenString := string(soc.Conn().Headers().Cookie("AuthToken"))
tokenString := "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJvdmVyRmxvdyIsImlhdCI6MTUwNDU5NTExOSwiZXhwIjoxNTM2MTMxMTE5LCJhdWQiOiJ3d3cub3ZlcmZsb3cuY2xvdWQiLCJzdWIiOiJvdmVyZmxvd0Bsb2FmbGUuY29tIn0.-WQi3OykPlJ9x8RcZGhWXEtGw4GhU6wmyJ_AWh2rMeUatQylfPzvmum2Xfp6pwKLMmcP76XoDPNyq06i7RKWNQ" tokenString := "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJvdmVyRmxvdyIsImlhdCI6MTUwNDU5NTExOSwiZXhwIjoxNTM2MTMxMTE5LCJhdWQiOiJ3d3cub3ZlcmZsb3cuY2xvdWQiLCJzdWIiOiJvdmVyZmxvd0Bsb2FmbGUuY29tIn0.-WQi3OykPlJ9x8RcZGhWXEtGw4GhU6wmyJ_AWh2rMeUatQylfPzvmum2Xfp6pwKLMmcP76XoDPNyq06i7RKWNQ"
@ -51,6 +52,6 @@ func (sh *RPCGatewayHandlers) Handshake(ctx *fasthttp.RequestCtx) (id string, ex
return claims["sub"].(string), nil return claims["sub"].(string), nil
} }
func (sh *RPCGatewayHandlers) Validate() { func (sh *GatewayRPCHandlers) Validate() {
sh.RPCGatewayHandlers.Validate() sh.GatewayRPCHandlers.Validate()
} }

17
servlet/noauth/rpc_gateway_handlers.go → servlet/noauth/gateway_rpc_handlers.go
View File

@ -4,27 +4,28 @@ import (
"fmt" "fmt"
"git.loafle.net/commons_go/logging" "git.loafle.net/commons_go/logging"
cwf "git.loafle.net/commons_go/websocket_fasthttp"
"git.loafle.net/overflow/overflow_gateway_websocket/config" "git.loafle.net/overflow/overflow_gateway_websocket/config"
"git.loafle.net/overflow/overflow_gateway_websocket/rpc" "git.loafle.net/overflow/overflow_gateway_websocket/rpc"
jwt "github.com/dgrijalva/jwt-go" jwt "github.com/dgrijalva/jwt-go"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
) )
func newRPCGatewayHandler() rpc.RPCGatewayHandler { func newGatewayRPCHandler() rpc.GatewayRPCHandler {
gh := &RPCGatewayHandlers{} gh := &GatewayRPCHandlers{}
return gh return gh
} }
type RPCGatewayHandlers struct { type GatewayRPCHandlers struct {
rpc.RPCGatewayHandlers rpc.GatewayRPCHandlers
} }
func (sh *RPCGatewayHandlers) Init() error { func (sh *GatewayRPCHandlers) Init(serverCTX cwf.ServerContext) error {
return nil return nil
} }
func (sh *RPCGatewayHandlers) Handshake(ctx *fasthttp.RequestCtx) (id string, extensionsHeader *fasthttp.ResponseHeader) { func (sh *GatewayRPCHandlers) Handshake(serverCTX cwf.ServerContext, ctx *fasthttp.RequestCtx) (id string, extensionsHeader *fasthttp.ResponseHeader) {
var ok bool var ok bool
// tokenString := string(soc.Conn().Headers().Cookie("AuthToken")) // tokenString := string(soc.Conn().Headers().Cookie("AuthToken"))
tokenString := "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJvdmVyRmxvdyIsImlhdCI6MTUwNDU5NTExOSwiZXhwIjoxNTM2MTMxMTE5LCJhdWQiOiJ3d3cub3ZlcmZsb3cuY2xvdWQiLCJzdWIiOiJvdmVyZmxvd0Bsb2FmbGUuY29tIn0.-WQi3OykPlJ9x8RcZGhWXEtGw4GhU6wmyJ_AWh2rMeUatQylfPzvmum2Xfp6pwKLMmcP76XoDPNyq06i7RKWNQ" tokenString := "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJvdmVyRmxvdyIsImlhdCI6MTUwNDU5NTExOSwiZXhwIjoxNTM2MTMxMTE5LCJhdWQiOiJ3d3cub3ZlcmZsb3cuY2xvdWQiLCJzdWIiOiJvdmVyZmxvd0Bsb2FmbGUuY29tIn0.-WQi3OykPlJ9x8RcZGhWXEtGw4GhU6wmyJ_AWh2rMeUatQylfPzvmum2Xfp6pwKLMmcP76XoDPNyq06i7RKWNQ"
@ -51,6 +52,6 @@ func (sh *RPCGatewayHandlers) Handshake(ctx *fasthttp.RequestCtx) (id string, ex
return claims["sub"].(string), nil return claims["sub"].(string), nil
} }
func (sh *RPCGatewayHandlers) Validate() { func (sh *GatewayRPCHandlers) Validate() {
sh.RPCGatewayHandlers.Validate() sh.GatewayRPCHandlers.Validate()
} }

7
servlet/noauth/noauth.go
View File

@ -17,20 +17,19 @@ var (
cfg *oosc.Servlet cfg *oosc.Servlet
) )
func ServletInit(sh oogws.ServerHandler) { func ServletInit(sh oogws.ServerHandler) {
cfg = oogwc.Config.Servlets[Name] cfg = oogwc.Config.Servlets[Name]
if nil == cfg { if nil == cfg {
logging.Logger().Panic(fmt.Sprintf("Webapp: config of servlet[%s] is not exist", Name)) logging.Logger().Panic(fmt.Sprintf("Webapp: config of servlet[%s] is not exist", Name))
} }
rpcGH := newRPCGatewayHandler() rpcGH := newGatewayRPCHandler()
rpcSH := sh.RegisterRPCGatewayServlet(Name, rpcGH) rpcSH := sh.RegisterRPCGatewayServlet(Name, rpcGH)
sub := newSubscriberHandler(rpcSH) sub := newSubscriberHandler(rpcSH)
sh.RegisterSubscriber(sub) sh.RegisterSubscriber(sub)
} }
func ServletDestroy() {
func ServletDestroy() {
} }

17
servlet/probe/rpc_gateway_handlers.go → servlet/probe/gateway_rpc_handlers.go
View File

@ -4,27 +4,28 @@ import (
"fmt" "fmt"
"git.loafle.net/commons_go/logging" "git.loafle.net/commons_go/logging"
cwf "git.loafle.net/commons_go/websocket_fasthttp"
"git.loafle.net/overflow/overflow_gateway_websocket/config" "git.loafle.net/overflow/overflow_gateway_websocket/config"
"git.loafle.net/overflow/overflow_gateway_websocket/rpc" "git.loafle.net/overflow/overflow_gateway_websocket/rpc"
jwt "github.com/dgrijalva/jwt-go" jwt "github.com/dgrijalva/jwt-go"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
) )
func newRPCGatewayHandler() rpc.RPCGatewayHandler { func newGatewayRPCHandler() rpc.GatewayRPCHandler {
gh := &RPCGatewayHandlers{} gh := &GatewayRPCHandlers{}
return gh return gh
} }
type RPCGatewayHandlers struct { type GatewayRPCHandlers struct {
rpc.RPCGatewayHandlers rpc.GatewayRPCHandlers
} }
func (sh *RPCGatewayHandlers) Init() error { func (sh *GatewayRPCHandlers) Init(serverCTX cwf.ServerContext) error {
return nil return nil
} }
func (sh *RPCGatewayHandlers) Handshake(ctx *fasthttp.RequestCtx) (id string, extensionsHeader *fasthttp.ResponseHeader) { func (sh *GatewayRPCHandlers) Handshake(serverCTX cwf.ServerContext, ctx *fasthttp.RequestCtx) (id string, extensionsHeader *fasthttp.ResponseHeader) {
var ok bool var ok bool
// tokenString := string(soc.Conn().Headers().Cookie("AuthToken")) // tokenString := string(soc.Conn().Headers().Cookie("AuthToken"))
tokenString := "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJvdmVyRmxvdyIsImlhdCI6MTUwNDU5NTExOSwiZXhwIjoxNTM2MTMxMTE5LCJhdWQiOiJ3d3cub3ZlcmZsb3cuY2xvdWQiLCJzdWIiOiJvdmVyZmxvd0Bsb2FmbGUuY29tIn0.-WQi3OykPlJ9x8RcZGhWXEtGw4GhU6wmyJ_AWh2rMeUatQylfPzvmum2Xfp6pwKLMmcP76XoDPNyq06i7RKWNQ" tokenString := "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJvdmVyRmxvdyIsImlhdCI6MTUwNDU5NTExOSwiZXhwIjoxNTM2MTMxMTE5LCJhdWQiOiJ3d3cub3ZlcmZsb3cuY2xvdWQiLCJzdWIiOiJvdmVyZmxvd0Bsb2FmbGUuY29tIn0.-WQi3OykPlJ9x8RcZGhWXEtGw4GhU6wmyJ_AWh2rMeUatQylfPzvmum2Xfp6pwKLMmcP76XoDPNyq06i7RKWNQ"
@ -51,6 +52,6 @@ func (sh *RPCGatewayHandlers) Handshake(ctx *fasthttp.RequestCtx) (id string, ex
return claims["sub"].(string), nil return claims["sub"].(string), nil
} }
func (sh *RPCGatewayHandlers) Validate() { func (sh *GatewayRPCHandlers) Validate() {
sh.RPCGatewayHandlers.Validate() sh.GatewayRPCHandlers.Validate()
} }

8
servlet/probe/probe.go
View File

@ -1,6 +1,5 @@
package probe package probe
import ( import (
"fmt" "fmt"
@ -18,20 +17,19 @@ var (
cfg *oosc.Servlet cfg *oosc.Servlet
) )
func ServletInit(sh oogws.ServerHandler) { func ServletInit(sh oogws.ServerHandler) {
cfg = oogwc.Config.Servlets[Name] cfg = oogwc.Config.Servlets[Name]
if nil == cfg { if nil == cfg {
logging.Logger().Panic(fmt.Sprintf("Webapp: config of servlet[%s] is not exist", Name)) logging.Logger().Panic(fmt.Sprintf("Webapp: config of servlet[%s] is not exist", Name))
} }
rpcGH := newRPCGatewayHandler() rpcGH := newGatewayRPCHandler()
rpcSH := sh.RegisterRPCGatewayServlet(Name, rpcGH) rpcSH := sh.RegisterRPCGatewayServlet(Name, rpcGH)
sub := newSubscriberHandler(rpcSH) sub := newSubscriberHandler(rpcSH)
sh.RegisterSubscriber(sub) sh.RegisterSubscriber(sub)
} }
func ServletDestroy() {
func ServletDestroy() {
} }