From 23d5f5406a957afa66c5783f7bfee07813acd054 Mon Sep 17 00:00:00 2001 From: crusader Date: Tue, 14 Nov 2017 12:42:55 +0900 Subject: [PATCH] ing --- external/external.go | 4 ++-- external/grpc/pool.go | 12 ++++++------ glide.yaml | 5 ----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/external/external.go b/external/external.go index 1851a02..506f38f 100644 --- a/external/external.go +++ b/external/external.go @@ -1,8 +1,8 @@ package external import ( - "git.loafle.net/overflow/overflow_gateway_app/external/grpc" - "git.loafle.net/overflow/overflow_gateway_app/external/redis" + "git.loafle.net/overflow/overflow_gateway_websocket/external/grpc" + "git.loafle.net/overflow/overflow_gateway_websocket/external/redis" ) func ExternalInit() { diff --git a/external/grpc/pool.go b/external/grpc/pool.go index d39caf9..4c98317 100644 --- a/external/grpc/pool.go +++ b/external/grpc/pool.go @@ -6,7 +6,7 @@ import ( cgp "git.loafle.net/commons_go/grpc_pool" "git.loafle.net/commons_go/logging" ooas "git.loafle.net/overflow/overflow_api_server/golang" - "git.loafle.net/overflow/overflow_gateway_app/conf" + "git.loafle.net/overflow/overflow_gateway_websocket/config" "google.golang.org/grpc" ) @@ -14,10 +14,10 @@ var grpcPool cgp.Pool func ExternalInit() { ph := &grpcPoolHandlers{} - ph.MaxCapacity = conf.Config.GRPC.Pool.MaxCapacity - ph.MaxIdle = conf.Config.GRPC.Pool.MaxIdle - ph.IdleTimeout = conf.Config.GRPC.Pool.IdleTimeout - ph.Wait = conf.Config.GRPC.Pool.Wait + ph.MaxCapacity = config.Config.GRPC.Pool.MaxCapacity + ph.MaxIdle = config.Config.GRPC.Pool.MaxIdle + ph.IdleTimeout = config.Config.GRPC.Pool.IdleTimeout + ph.Wait = config.Config.GRPC.Pool.Wait grpcPool = cgp.New(ph) @@ -39,7 +39,7 @@ type grpcPoolHandlers struct { func (h *grpcPoolHandlers) Dial() (*grpc.ClientConn, interface{}, error) { var err error - conn, err := grpc.Dial(conf.Config.GRPC.Addr, grpc.WithInsecure()) + conn, err := grpc.Dial(config.Config.GRPC.Addr, grpc.WithInsecure()) if nil != err { return nil, nil, err } diff --git a/glide.yaml b/glide.yaml index 3cf0b75..b50ceb6 100644 --- a/glide.yaml +++ b/glide.yaml @@ -6,11 +6,6 @@ import: - package: git.loafle.net/overflow/overflow_api_server subpackages: - golang -- package: git.loafle.net/overflow/overflow_gateway_app - subpackages: - - conf - - external/grpc - - external/redis - package: github.com/garyburd/redigo subpackages: - redis