gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix empty public url

Browse Source
This commit is contained in:
chrislusf
2015-04-08 11:08:08 -07:00
parent 3ece066700
commit 71e9b302d4
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
go/weed/server.go
View File

@@ -228,6 +228,9 @@ func runServer(cmd *Command, args []string) bool {
if *volumePublicPort == 0 { if *volumePublicPort == 0 {
*volumePublicPort = *volumePort *volumePublicPort = *volumePort
} }
if *serverPublicUrl == "" {
*serverPublicUrl = *serverIp + ":" + strconv.Itoa(*volumePublicPort)
}
isSeperatedPublicPort := *volumePublicPort != *volumePort isSeperatedPublicPort := *volumePublicPort != *volumePort
volumeMux := http.NewServeMux() volumeMux := http.NewServeMux()
publicVolumeMux := volumeMux publicVolumeMux := volumeMux

6
go/weed/volume.go
View File

@@ -101,13 +101,13 @@ func runVolume(cmd *Command, args []string) bool {
if *v.ip == "" { if *v.ip == "" {
*v.ip = "127.0.0.1" *v.ip = "127.0.0.1"
} }
if *v.publicUrl == "" {
*v.publicUrl = *v.ip + ":" + strconv.Itoa(*v.port)
}
if *v.publicPort == 0 { if *v.publicPort == 0 {
*v.publicPort = *v.port *v.publicPort = *v.port
} }
if *v.publicUrl == "" {
*v.publicUrl = *v.ip + ":" + strconv.Itoa(*v.publicPort)
}
isSeperatedPublicPort := *v.publicPort != *v.port isSeperatedPublicPort := *v.publicPort != *v.port
volumeMux := http.NewServeMux() volumeMux := http.NewServeMux()