diff --git a/Makefile b/Makefile index 4dbf0d99..72bbb120 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ export PATH := $(GOPATH)/bin:$(PATH) -export NEW_GOPATH := $(shell pwd) +export GOPATH := $(shell pwd):$(GOPATH) all: build @@ -9,13 +9,13 @@ godep: @go get github.com/tools/godep fmt: - GOPATH=$(NEW_GOPATH) godep go fmt ./... + godep go fmt ./... frps: - GOPATH=$(NEW_GOPATH) godep go build -o bin/frps ./src/frp/cmd/frps + godep go build -o bin/frps ./src/frp/cmd/frps frpc: - GOPATH=$(NEW_GOPATH) godep go build -o bin/frpc ./src/frp/cmd/frpc + godep go build -o bin/frpc ./src/frp/cmd/frpc test: - @GOPATH=$(NEW_GOPATH) godep go test -v ./... + godep go test -v ./... diff --git a/conf/frpc.ini b/conf/frpc.ini index 2f48a80c..86679e6d 100644 --- a/conf/frpc.ini +++ b/conf/frpc.ini @@ -3,9 +3,9 @@ server_addr = 0.0.0.0 server_port = 7000 # console or real logFile path like ./frpc.log -log_file = console +log_file = ./frpc.log # debug, info, warn, error -log_level = debug +log_level = info # for authentication auth_token = 123 diff --git a/conf/frps.ini b/conf/frps.ini index c410410d..cfb9e7b7 100644 --- a/conf/frps.ini +++ b/conf/frps.ini @@ -3,9 +3,9 @@ bind_addr = 0.0.0.0 bind_port = 7000 # console or real logFile path like ./frps.log -log_file = console +log_file = ./frps.log # debug, info, warn, error -log_level = debug +log_level = info # test1 is the proxy name, client will use this name and auth_token to connect to server [test1]