This commit is contained in:
crusader 2017-07-28 16:52:16 +09:00
parent d4508a20d5
commit 41dbd197ed
7 changed files with 27 additions and 11 deletions

2
.gitignore vendored
View File

@ -64,3 +64,5 @@ fabric.properties
vendor/
glide.lock
.DS_Store
dist/
debug

17
Dockerfile Normal file
View File

@ -0,0 +1,17 @@
FROM alpine:latest
ENV APP_VERSION=1.0.0 \
APP_HOME=/service \
APP_NAME=overflow_service_websocket
WORKDIR ${APP_HOME}
ADD dist/${APP_NAME} ${APP_HOME}/
ADD config.json ${APP_HOME}/
EXPOSE 80 443
ENTRYPOINT ["./overflow_service_websocket"]
# docker build -f Dockerfile -t docker.loafle.net/overflow/overflow_service_websocket:1.0.0-alpine .
# docker run -d -p 18081:80 -t docker.loafle.net/overflow/overflow_service_websocket:1.0.0-alpine

2
build.sh Executable file
View File

@ -0,0 +1,2 @@
rm ./dist/*
CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags="-s" -o ./dist/overflow_service_websocket

View File

@ -1,7 +1,6 @@
{
"server": {
"ip": "127.0.0.1",
"port": 18081,
"addr": ":80",
"tls": false
},
"websocket": {
@ -14,8 +13,7 @@
"writeBufferSize": 4096
},
"gRpc": {
"ip": "localhost",
"port": 50006,
"addr": "192.168.1.101:50006",
"tls": false,
"pool": {
"initialCapacity": 30,

View File

@ -13,8 +13,7 @@ type Config struct {
}
type ServerConfig struct {
Ip string `required:"true"`
Port uint16 `required:"true"`
Addr string `required:"true"`
Tls bool `default:"false"`
}

View File

@ -1,7 +1,6 @@
package main
import (
"fmt"
"log"
"net/http"
"os"
@ -17,7 +16,7 @@ func main() {
// Initialize config
config := loadConfig()
addr := fmt.Sprintf("%s:%d", config.Server.Ip, config.Server.Port)
addr := config.Server.Addr
useTLS := config.Server.Tls
sConfig := server.NewOptions(&config.Websocket)
// Print banner

View File

@ -2,7 +2,6 @@ package jsonrpc
import (
"encoding/json"
"fmt"
"log"
"strings"
@ -29,7 +28,7 @@ type Response struct {
func NewHandler() protocol.Handler {
c := config.GetConfig().GRpc
addr := fmt.Sprintf("%s:%d", c.Ip, c.Port)
addr := c.Addr
servicePool, err := grpcPool.New(1, 5,
func(conn *grpc.ClientConn) (interface{}, error) {