Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release3.0 #1715

Open
wants to merge 21 commits into
base: release3.2
Choose a base branch
from
Open

Release3.0 #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7840c21
set GO15VENDOREXPERIMENT=1 & add vendor folder
spinlock Aug 17, 2016
4ceb49d
fix #928, keep option GO15VENDOREXPERIMENT=1 in Makefile
spinlock Aug 17, 2016
88be0af
rpc: generate token with MAC Addr plus bind addr
spinlock Sep 22, 2016
f7a0b60
topom: reinit proxy automatically
spinlock Sep 22, 2016
c83b423
Dockerfile: update
spinlock Sep 22, 2016
b18b40c
fe: reload dashboard from zk/etcd
spinlock Sep 22, 2016
b101c01
travis: update os, build with osx & linux
spinlock Sep 22, 2016
94436be
docker: call apt-get update first
spinlock Sep 22, 2016
672696b
Update tutorial_zh.md
spinlock Sep 22, 2016
1dc4991
deploy: generate configs with python scripts
spinlock Sep 26, 2016
69f1df1
jodis: fix jodis path
spinlock Sep 26, 2016
adcb103
deploy: set jodis_compatible in proxy.toml.template
spinlock Sep 26, 2016
74b676b
Update doc/tutorial_zh.md
spinlock Sep 26, 2016
daa2e5f
Update tutorial_zh.md
spinlock Sep 26, 2016
0d26ab3
deploy: set jodis_compatible = true as default
spinlock Sep 26, 2016
c2a5fd3
topom: don't remove master while promoting a group
spinlock Aug 24, 2016
4a176a4
deploy: update templates
spinlock Sep 28, 2016
49207e4
deploy: update templates
spinlock Sep 29, 2016
29199bb
deploy: conflict with systemctl template
spinlock Sep 29, 2016
c3ae449
Update README.md
yangzhe1991 Sep 30, 2016
a99a681
Update README.md
yangzhe1991 Sep 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

.DS_Store

/Godeps/_workspace
.htaccess

/bin
/tmp
/pkg/utils/version.go

makefile
15 changes: 5 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
language: go

env:
- GO15VENDOREXPERIMENT=0
os:
- linux
- osx

go:
- 1.6.2
- 1.6.1
- 1.5.4
- 1.4.3
- 1.3.3

install:
- go get -u github.com/tools/godep
- 1.6.3
- tip

script:
- make godep
- make gotest
5 changes: 1 addition & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
FROM golang:1.4
FROM golang:1.6.3

RUN apt-get update
RUN apt-get install -y vim bash golang
RUN apt-get clean
RUN rm -rf /var/lib/apt/lists/*

ENV GOPATH /gopath
ENV CODIS ${GOPATH}/src/github.com/CodisLabs/codis
Expand Down
17 changes: 12 additions & 5 deletions Godeps/Godeps.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 11 additions & 29 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,45 @@
.DEFAULT_GOAL := build-all

export GO15VENDOREXPERIMENT=0

.PHONY: godep

GODEP :=

ifndef GODEP
GODEP := $(shell \
if which godep 2>&1 >/dev/null; then \
echo "godep"; \
else \
if [ ! -x "${GOPATH}/bin/godep" ]; then \
go get -u github.com/tools/godep; \
fi; \
echo "${GOPATH}/bin/godep"; \
fi;)
endif
export GO15VENDOREXPERIMENT=1

build-all: codis-server codis-dashboard codis-proxy codis-admin codis-ha codis-fe

godep:
@GOPATH=`${GODEP} path` ${GODEP} restore -v 2>&1 | while IFS= read -r line; do echo " >>>> $${line}"; done
@echo

codis-deps:
@mkdir -p bin && bash version

codis-proxy: codis-deps
${GODEP} go build -i -o bin/codis-proxy ./cmd/proxy
go build -i -o bin/codis-proxy ./cmd/proxy

codis-admin: codis-deps
${GODEP} go build -i -o bin/codis-admin ./cmd/admin
go build -i -o bin/codis-admin ./cmd/admin

codis-dashboard: codis-deps
${GODEP} go build -i -o bin/codis-dashboard ./cmd/dashboard
go build -i -o bin/codis-dashboard ./cmd/dashboard

codis-ha: codis-deps
${GODEP} go build -i -o bin/codis-ha ./cmd/ha
go build -i -o bin/codis-ha ./cmd/ha

codis-fe: codis-deps
${GODEP} go build -i -o bin/codis-fe ./cmd/fe
go build -i -o bin/codis-fe ./cmd/fe
@rm -rf bin/assets; cp -rf cmd/fe/assets bin/

codis-server:
@mkdir -p bin
make -j -C extern/redis-2.8.21/
@rm -f bin/codis-server
@cp -f extern/redis-2.8.21/src/redis-server bin/codis-server
@cp -f extern/redis-2.8.21/src/redis-benchmark bin/
@cp -f extern/redis-2.8.21/src/redis-cli bin/

clean:
@rm -rf bin
@rm -rf scripts/tmp

distclean: clean
@rm -rf Godeps/_workspace/pkg scripts/tmp
@make --no-print-directory --quiet -C extern/redis-2.8.21 clean
@make --no-print-directory --quiet -C extern/redis-2.8.21 distclean

gotest: codis-deps
${GODEP} go test ./pkg/...
go test ./pkg/...

docker:
docker build --force-rm -t codis-image .
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

Codis is a proxy based high performance Redis cluster solution written in Go. It is production-ready and widely used at [wandoujia.com](http://wandoujia.com) and many companies. You can see [Codis Releases](https://github.com/CodisLabs/codis/releases) for latest and most stable realeases.

##Donation
Donate if you want to help us maintaining this project. Thank you!
[See this issue for details](https://github.com/CodisLabs/codis/issues/976)

##Compared with Twemproxy and Redis Cluster
<table>
<tr><th></th><th>Codis</th><th>Twemproxy</th><th>Redis Cluster</th></tr>
Expand Down
Loading