mbk-lab
/
wide
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.

This commit is contained in:
Liang Ding 2014-11-18 15:42:11 +08:00
parent 260bd543ad
commit d1b0733493
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
conf/wide.go
View File

@ -18,7 +18,6 @@ package conf
import ( import (
"encoding/json" "encoding/json"
"io/ioutil" "io/ioutil"
"net"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -294,6 +293,11 @@ func Load(confPath, confIP, confPort, confServer, confChannel string, confDocker
glog.V(5).Infof("${ip} [%s]", ip) glog.V(5).Infof("${ip} [%s]", ip)
// Docker
if confDocker {
confChannel = os.Getenv("channel") // overwrite channel specified
}
if "" != confIP { if "" != confIP {
ip = confIP ip = confIP
} }
@ -331,23 +335,6 @@ func Load(confPath, confIP, confPort, confServer, confChannel string, confDocker
Wide.SessionChannel = confChannel Wide.SessionChannel = confChannel
} }
// Docker
if confDocker {
h, err := net.LookupHost("wide")
if nil != err {
glog.Error(err)
os.Exit(-1)
}
// XXX: secure protocol wss enchance
channel := "ws://" + h[0] + ":" + Wide.Port
Wide.EditorChannel = channel
Wide.OutputChannel = channel
Wide.ShellChannel = channel
Wide.SessionChannel = channel
}
Wide.Server = strings.Replace(Wide.Server, "{Port}", Wide.Port, 1) Wide.Server = strings.Replace(Wide.Server, "{Port}", Wide.Port, 1)
Wide.StaticServer = strings.Replace(Wide.StaticServer, "{Port}", Wide.Port, 1) Wide.StaticServer = strings.Replace(Wide.StaticServer, "{Port}", Wide.Port, 1)
Wide.EditorChannel = strings.Replace(Wide.EditorChannel, "{Port}", Wide.Port, 1) Wide.EditorChannel = strings.Replace(Wide.EditorChannel, "{Port}", Wide.Port, 1)