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

containerize

This commit is contained in:
Liang Ding 2014-11-18 15:05:01 +08:00
parent 8b1ffe0544
commit 10f8f9f86c
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
conf/wide.go
View File

@ -280,9 +280,11 @@ func Load(confPath, confIP, confPort, confServer, confChannel string, confDocker
// keep the raw content
json.Unmarshal(bytes, &rawWide)
// Working Driectory
Wide.WD = util.OS.Pwd()
glog.V(5).Infof("${pwd} [%s]", Wide.WD)
// IP
ip, err := util.Net.LocalIP()
if err != nil {
glog.Error(err)
@ -292,18 +294,6 @@ func Load(confPath, confIP, confPort, confServer, confChannel string, confDocker
glog.V(5).Infof("${ip} [%s]", ip)
if confDocker {
h, err := net.LookupHost("wide")
if nil != err {
glog.Error(err)
os.Exit(-1)
}
ip = h[0]
}
if "" != confIP {
ip = confIP
}
@ -314,12 +304,16 @@ func Load(confPath, confIP, confPort, confServer, confChannel string, confDocker
Wide.Port = confPort
}
// Server
Wide.Server = strings.Replace(Wide.Server, "{IP}", Wide.IP, 1)
if "" != confServer {
Wide.Server = confServer
}
// Static Server
Wide.StaticServer = strings.Replace(Wide.StaticServer, "{IP}", Wide.IP, 1)
// Channels
Wide.EditorChannel = strings.Replace(Wide.EditorChannel, "{IP}", Wide.IP, 1)
if "" != confChannel {
Wide.EditorChannel = confChannel
@ -337,6 +331,23 @@ func Load(confPath, confIP, confPort, confServer, confChannel string, confDocker
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.StaticServer = strings.Replace(Wide.StaticServer, "{Port}", Wide.Port, 1)
Wide.EditorChannel = strings.Replace(Wide.EditorChannel, "{Port}", Wide.Port, 1)