ing
This commit is contained in:
parent
f5f56d2924
commit
18845c4ff9
32
main.go
32
main.go
|
@ -1,20 +1,40 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"flag"
|
||||||
"log"
|
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
|
cc "git.loafle.net/commons_go/config"
|
||||||
"git.loafle.net/commons_go/logging"
|
"git.loafle.net/commons_go/logging"
|
||||||
|
oocc "git.loafle.net/overflow/overflow_commons_go/config"
|
||||||
"git.loafle.net/overflow/overflow_gateway_probe/server"
|
"git.loafle.net/overflow/overflow_gateway_probe/server"
|
||||||
"git.loafle.net/overflow/overflow_gateway_probe/servlet"
|
"git.loafle.net/overflow/overflow_gateway_probe/servlet"
|
||||||
|
oogwc "git.loafle.net/overflow/overflow_gateway_websocket/config"
|
||||||
oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
|
oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
var (
|
||||||
|
configDir *string
|
||||||
|
logConfigPath *string
|
||||||
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
configDir = oocc.FlagConfigDir("./")
|
||||||
|
logConfigPath = oocc.FlagLogConfigFilePath("")
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
logging.InitializeLogger(*logConfigPath)
|
||||||
|
|
||||||
|
cc.SetConfigPath(*configDir)
|
||||||
|
if err := cc.Load(&oogwc.Config, oocc.ConfigFileName); nil != err {
|
||||||
|
logging.Logger().Panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
defer logging.Logger().Sync()
|
defer logging.Logger().Sync()
|
||||||
|
|
||||||
sh := server.NewServerHandler()
|
sh := server.NewServerHandler()
|
||||||
|
@ -27,17 +47,19 @@ func main() {
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
if err := s.Start(); nil != err {
|
if err := s.Start(); nil != err {
|
||||||
log.Printf("Server: Start error %v", err)
|
logging.Logger().Infof("Server: Start error %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
select {
|
select {
|
||||||
case signal := <-stop:
|
case signal := <-stop:
|
||||||
fmt.Printf("Got signal: %v\n", signal)
|
logging.Logger().Infof("Got signal: %v", signal)
|
||||||
}
|
}
|
||||||
|
|
||||||
servlet.ServletDestroy()
|
servlet.ServletDestroy()
|
||||||
|
|
||||||
s.Stop()
|
s.Stop()
|
||||||
|
|
||||||
|
logging.Logger().Infof("Server stopped")
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
package auth
|
package auth
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"git.loafle.net/commons_go/logging"
|
"git.loafle.net/commons_go/logging"
|
||||||
oogwc "git.loafle.net/overflow/overflow_gateway_websocket/config"
|
oogwc "git.loafle.net/overflow/overflow_gateway_websocket/config"
|
||||||
oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
|
oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
|
||||||
|
@ -20,7 +18,7 @@ var (
|
||||||
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().Panicf("Webapp: config of servlet[%s] is not exist", Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
rpcGH := newGatewayRPCHandler()
|
rpcGH := newGatewayRPCHandler()
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
package data
|
package data
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"git.loafle.net/commons_go/logging"
|
"git.loafle.net/commons_go/logging"
|
||||||
oogwc "git.loafle.net/overflow/overflow_gateway_websocket/config"
|
oogwc "git.loafle.net/overflow/overflow_gateway_websocket/config"
|
||||||
oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
|
oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
|
||||||
|
@ -20,7 +18,7 @@ var (
|
||||||
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().Panicf("Webapp: config of servlet[%s] is not exist", Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
rpcGH := newGatewayRPCHandler()
|
rpcGH := newGatewayRPCHandler()
|
||||||
|
|
|
@ -60,7 +60,7 @@ func (sh *GatewayRPCHandlers) Handshake(socketCTX cwf.SocketContext, ctx *fastht
|
||||||
|
|
||||||
// var claims jwt.MapClaims
|
// var claims jwt.MapClaims
|
||||||
// if claims, ok = token.Claims.(jwt.MapClaims); !ok || !token.Valid {
|
// if claims, ok = token.Claims.(jwt.MapClaims); !ok || !token.Valid {
|
||||||
// logging.Logger().Warn(fmt.Sprintf("Webapp: Token is not valid %v", token))
|
// logging.Logger().Warnf("Webapp: Token is not valid %v", token)
|
||||||
// return "", nil
|
// return "", nil
|
||||||
// }
|
// }
|
||||||
bProbeKey := ctx.Request.Header.Peek(oocmp.HTTPRequestHeaderKey_Probe_ProbeKey)
|
bProbeKey := ctx.Request.Header.Peek(oocmp.HTTPRequestHeaderKey_Probe_ProbeKey)
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
package probe
|
package probe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"git.loafle.net/commons_go/logging"
|
"git.loafle.net/commons_go/logging"
|
||||||
oogwc "git.loafle.net/overflow/overflow_gateway_websocket/config"
|
oogwc "git.loafle.net/overflow/overflow_gateway_websocket/config"
|
||||||
oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
|
oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
|
||||||
|
@ -20,7 +18,7 @@ var (
|
||||||
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().Panicf("Webapp: config of servlet[%s] is not exist", Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
rpcGH := newGatewayRPCHandler()
|
rpcGH := newGatewayRPCHandler()
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
package probe
|
package probe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"git.loafle.net/commons_go/logging"
|
"git.loafle.net/commons_go/logging"
|
||||||
"git.loafle.net/commons_go/websocket_fasthttp/websocket"
|
"git.loafle.net/commons_go/websocket_fasthttp/websocket"
|
||||||
oogws "git.loafle.net/overflow/overflow_gateway_websocket/servlet"
|
oogws "git.loafle.net/overflow/overflow_gateway_websocket/servlet"
|
||||||
|
@ -31,7 +29,7 @@ func (sh *SubscriberHandlers) OnSubscribe(channel string, message oos.SubscribeM
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
logging.Logger().Warn(fmt.Sprintf("[PROBE] SubscriberHandler: Unknown TargetType %s", message.TargetType))
|
logging.Logger().Warnf("[PROBE] SubscriberHandler: Unknown TargetType %s", message.TargetType)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user