diff --git a/.travis.yml b/.travis.yml index 01be3f1..088d336 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,9 @@ os: - osx go: - - "1.10.x" - "1.11.x" + - "1.12.x" + - "1.13.x" env: - GO111MODULE=on @@ -15,10 +16,10 @@ before_install: - pip install --user -r tests/pip-req.txt install: - - go get -t -v ./... - go get -u golang.org/x/tools/cmd/goimports - - go get -u github.com/douban/gobeansdb script: - diff <(goimports -d .) <(printf "") + - make install + - go get -u github.com/douban/gobeansdb - make test diff --git a/Makefile b/Makefile index 3ee05a5..4fb8891 100644 --- a/Makefile +++ b/Makefile @@ -2,17 +2,6 @@ all:install export PYTHONPATH=. -# FIXME: When this issue is done(https://github.com/golang/go/issues/23965#issuecomment-409232583) -# Determine the compiler and version -COMPILER_HELP := $(shell $(CC) --help | head -n 1) -ifneq (,$(findstring clang,$(COMPILER_HELP))) - COMPILER = clang -else ifneq (,$(findstring gcc,$(COMPILER_HELP))) - COMPILER = gcc -else - COMPILER = unknown -endif - test: ./misc/gobeansdb_server.sh start go version @@ -29,4 +18,4 @@ pytest:install install: GO111MODULE=on go mod vendor - CC=$(COMPILER) go install ./ + go install ./ diff --git a/README.md b/README.md index 0ce4df3..813d5ec 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ A proxy for [Gobeansdb](https://github.com/douban/gobeansdb). ## Prepare -GoBeansProxy use `vgo` manage dependencies, please install [vgo](https://godoc.org/golang.org/x/vgo) first. -Supported Go version: 1.10.1+ +Supported Go version: > 1.11.0 ## Install diff --git a/dstore/scheduler.go b/dstore/scheduler.go index ef53917..372e8ba 100644 --- a/dstore/scheduler.go +++ b/dstore/scheduler.go @@ -255,7 +255,7 @@ func (sch *ManualScheduler) checkFailsForBucket(bucket *Bucket) { } else { logger.Infof( "beansdb server %s in Bucket %X's Down while check fails , err is %s", - hostBucket.host.Addr, bucket, err) + hostBucket.host.Addr, bucket.ID, err) } } }