add HTTP_PROXY and TCP_PROXY evironment flag to allow tcp and http pr…

…oxy or lb frontend.
ruizeng · Dec 28, 2015 · 13fe9dc · 13fe9dc
1 parent 3d9eda3
commit 13fe9dc
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/pkg/server/server_manager.go b/pkg/server/server_manager.go
@@ -6,13 +6,16 @@ import (
 	"errors"
 	"github.com/coreos/etcd/client"
 	"golang.org/x/net/context"
+	"os"
 	"strings"
 	"time"
 )
 
 const (
 	EtcdServersPrefix    = "/pando/servers/"
 	EtcdServersPrefixCnt = 2
+	EnvTCPProxy          = "TCP_PROXY"
+	EnvHTTPProxy         = "HTTP_PROXY"
 )
 
 type ServerManager struct {
@@ -53,17 +56,23 @@ func (mgr *ServerManager) RegisterServer() error {
 	kapi := client.NewKeysAPI(c)
 	prefix := EtcdServersPrefix + mgr.serverName + "/"
 	var response *client.Response
-	opt := &client.SetOptions{TTL: 180 * time.Second}
+	opt := &client.SetOptions{TTL: 90 * time.Second}
 	if serverInstance.tcpsvr != nil {
-		addr, _ := fixHostIp(*confTCPHost)
+		addr := os.Getenv(EnvTCPProxy)
+		if addr == "" {
+			addr, _ = fixHostIp(*confTCPHost)
+		}
 		response, err = kapi.Set(context.Background(), prefix+FlagTCPHost+"/"+addr, addr, opt)
 	}
 	if serverInstance.rpcsvr != nil {
 		addr, _ := fixHostIp(*confRPCHost)
 		response, err = kapi.Set(context.Background(), prefix+FlagRPCHost+"/"+addr, addr, opt)
 	}
 	if serverInstance.httpsvr != nil {
-		addr, _ := fixHostIp(*confHTTPHost)
+		addr := os.Getenv(EnvHTTPProxy)
+		if addr == "" {
+			addr, _ = fixHostIp(*confHTTPHost)
+		}
 		response, err = kapi.Set(context.Background(), prefix+FlagHTTPHost+"/"+addr, addr, opt)
 	}
 	if err != nil {