From 133181bbe4ef1676bb12d13574be4314df1b0ac2 Mon Sep 17 00:00:00 2001 From: yourchanges Date: Tue, 3 Feb 2015 13:54:44 +0800 Subject: [PATCH] add -reverseProxyServer="volume.xxx.com" to volume server try to fix #9 (reverted from commit 3beb80c907d3c9583cc17b018bca2993b20e4604) --- go/weed/server.go | 6 +----- go/weed/volume.go | 7 ------- go/weed/weed_server/volume_server.go | 7 +------ 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/go/weed/server.go b/go/weed/server.go index 164c7e170..16b809c53 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -49,7 +49,6 @@ var cmdServer = &Command{ var ( serverIp = cmdServer.Flag.String("ip", "", "ip or server name") serverPublicIp = cmdServer.Flag.String("publicIp", "", "ip or server name") - reverseProxyServer = cmdServer.Flag.String("reverseProxyServer", "", "front-end reverse proxy server url , for replication > 000") serverBindIp = cmdServer.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to") serverMaxCpu = cmdServer.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs") serverTimeout = cmdServer.Flag.Int("idleTimeout", 10, "connection idle seconds") @@ -231,13 +230,10 @@ func runServer(cmd *Command, args []string) bool { *serverIp, *volumePort, *volumeAdminPort, *serverPublicIp, folders, maxCounts, *serverIp+":"+strconv.Itoa(*masterPort), *volumePulse, *serverDataCenter, *serverRack, - serverWhiteList, *volumeFixJpgOrientation, *reverseProxyServer, + serverWhiteList, *volumeFixJpgOrientation, ) glog.V(0).Infoln("Start Seaweed volume server", util.VERSION, "at", *serverIp+":"+strconv.Itoa(*volumePort)) - if *reverseProxyServer != "" { - glog.V(0).Infoln("The Seaweed volume server", util.VERSION, " is running behind the reverse proxy server", *reverseProxyServer) - } volumeListener, e := util.NewListener( *serverBindIp+":"+strconv.Itoa(*volumePort), time.Duration(*serverTimeout)*time.Second, diff --git a/go/weed/volume.go b/go/weed/volume.go index a35c05afa..df1d603ac 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -33,7 +33,6 @@ type VolumeServerOptions struct { rack *string whiteList []string fixJpgOrientation *bool - reverseProxyServer *string } func init() { @@ -50,7 +49,6 @@ func init() { v.dataCenter = cmdVolume.Flag.String("dataCenter", "", "current volume server's data center name") v.rack = cmdVolume.Flag.String("rack", "", "current volume server's rack name") v.fixJpgOrientation = cmdVolume.Flag.Bool("images.fix.orientation", true, "Adjust jpg orientation when uploading.") - v.reverseProxyServer = cmdVolume.Flag.String("reverseProxyServer", "", "front-end reverse proxy server url , for replication > 000") } var cmdVolume = &Command{ @@ -124,7 +122,6 @@ func runVolume(cmd *Command, args []string) bool { *v.master, *v.pulseSeconds, *v.dataCenter, *v.rack, v.whiteList, *v.fixJpgOrientation, - *v.reverseProxyServer, ) listeningAddress := *v.bindIp + ":" + strconv.Itoa(*v.port) @@ -154,9 +151,5 @@ func runVolume(cmd *Command, args []string) bool { if e := http.Serve(listener, publicMux); e != nil { glog.Fatalf("Volume server fail to serve: %v", e) } - - if *v.reverseProxyServer != "" { - glog.V(0).Infoln("The Seaweed volume server", util.VERSION, "is running behind the reverse proxy server", *v.reverseProxyServer) - } return true } diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go index f59833199..8846c4794 100644 --- a/go/weed/weed_server/volume_server.go +++ b/go/weed/weed_server/volume_server.go @@ -28,13 +28,8 @@ func NewVolumeServer(publicMux, adminMux *http.ServeMux, ip string, masterNode string, pulseSeconds int, dataCenter string, rack string, whiteList []string, - fixJpgOrientation bool, - reverseProxyServer string) *VolumeServer { - + fixJpgOrientation bool) *VolumeServer { publicUrl := publicIp + ":" + strconv.Itoa(port) - if reverseProxyServer != "" { - publicUrl = reverseProxyServer - } vs := &VolumeServer{ masterNode: masterNode, pulseSeconds: pulseSeconds,