Skip to content

Commit

Permalink
fix register server ip addr wrong bug
Browse files Browse the repository at this point in the history
  • Loading branch information
ruizeng committed Dec 16, 2015
1 parent 241c884 commit d4e7cf1
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 6 deletions.
23 changes: 23 additions & 0 deletions build/local/docker/run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/sh

SERVICES='etcd mysql redis mongo registry'

echo "stopping all services..."
docker stop `echo $SERVICES`
docker rm `echo $SERVICES`

echo "starting etcd"
docker run -d --name etcd elcolio/etcd

echo "starting mysql"
docker run -d --name mysql -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql
docker run -it --link mysql --rm mysql sh -c 'exec mysql -hmysql -e"CREATE DATABASE PandoCloud"'

echo "starting redis"
docker run -d --name redis redis

echo "starting mongo"
docker run -d --name mongo mongo

echo "starting registry"
docker run -d --name registry --link etcd --link mysql pandocloud/pando-cloud registry -etcd http://etcd:2379 -rpchost internal:20034 -aeskey ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP -dbhost mysql -dbname PandoCloud -dbport 3306 -dbuser root -loglevel debug
2 changes: 1 addition & 1 deletion build/local/linux/install.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
docker#!/bin/sh

# restore dependency packages.
cd $GOPATH/src/github.com/PandoCloud/pando-cloud
Expand Down
17 changes: 16 additions & 1 deletion docs/zh-cn/quick-start/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,19 @@
## 依赖
Docker是跨平台的容器管理工具,在Linux,OSX以及Windows上运行。您需要先再自己的系统中[安装Docker引擎](https://docs.docker.com/engine/installation/)。安装好Docker后不再需要安装其他环境。

##
## 执行启动脚本

我们提供了脚本在单机环境启动平台:

```sh
sudo sh -x ./build/local/docker/run.sh

```

首次运行需要下载镜像,需要较长时间,请耐心等待。

通过docker命令查看所有容器是否正常启动:

```
sudo docker ps -a
```
2 changes: 1 addition & 1 deletion docs/zh-cn/quick-start/ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Ubuntu是基于Linux的操作系统发行版。
## 说明
如果不想自己编译二进制程序,可以使用我们预先编译好的二进制包。

所有版本的二进制包在**[这里](https://github.com/PandoCloud/pando-cloud/releases)**发布和维护,选择适合自己系统的二进制包下载并解压,**不再需要编译**,直接参考[部署](#部署)说明进行部署。
所有版本的二进制包在**[GitHub Release](https://github.com/PandoCloud/pando-cloud/releases)**或者[百度网盘(国内推荐)](http://pan.baidu.com/s/1hqLlLFA)发布和维护,选择适合自己系统的二进制包下载并解压,**不再需要编译**,直接参考[部署](#部署)说明进行部署。

## 编译

Expand Down
9 changes: 6 additions & 3 deletions pkg/server/server_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,16 @@ func (mgr *ServerManager) RegisterServer() error {
var response *client.Response
opt := &client.SetOptions{TTL: 180 * time.Second}
if serverInstance.tcpsvr != nil {
response, err = kapi.Set(context.Background(), prefix+FlagTCPHost+"/"+*confTCPHost, *confTCPHost, opt)
addr, _ := fixHostIp(*confTCPHost)
response, err = kapi.Set(context.Background(), prefix+FlagTCPHost+"/"+addr, addr, opt)
}
if serverInstance.rpcsvr != nil {
response, err = kapi.Set(context.Background(), prefix+FlagRPCHost+"/"+*confRPCHost, *confRPCHost, opt)
addr, _ := fixHostIp(*confRPCHost)
response, err = kapi.Set(context.Background(), prefix+FlagRPCHost+"/"+addr, addr, opt)
}
if serverInstance.httpsvr != nil {
response, err = kapi.Set(context.Background(), prefix+FlagHTTPHost+"/"+*confHTTPHost, *confHTTPHost, opt)
addr, _ := fixHostIp(*confHTTPHost)
response, err = kapi.Set(context.Background(), prefix+FlagHTTPHost+"/"+addr, addr, opt)
}
if err != nil {
return err
Expand Down

0 comments on commit d4e7cf1

Please sign in to comment.