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

rename weedc option name to publicUrl

Browse Source 
git-svn-id: https://weed-fs.googlecode.com/svn/trunk@27 282b0af5-e82d-9cf1-ede4-77906d7719d0
This commit is contained in:
chris.lu@gmail.com
2011-12-26 10:07:53 +00:00
parent c27f6175d7
commit 4c36190dd3
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weed-fs/src/pkg/directory/volume_mapping.go
View File

@@ -37,8 +37,8 @@ type Mapper struct {
fileIdCounter uint64
}
func NewMachine(server, publicServer string, volumes []storage.VolumeInfo) *Machine {
return &Machine{Server: MachineInfo{Url: server, PublicUrl: publicServer}, Volumes: volumes}
func NewMachine(server, publicUrl string, volumes []storage.VolumeInfo) *Machine {
return &Machine{Server: MachineInfo{Url: server, PublicUrl: publicUrl}, Volumes: volumes}
}
func NewMapper(dirname string, filename string) (m *Mapper) {

8
weed-fs/src/pkg/storage/store.go
View File

@@ -14,15 +14,15 @@ type Store struct {
volumes map[uint64]*Volume
dir string
Port int
PublicServer string
PublicUrl string
}
type VolumeInfo struct {
Id uint32
Size int64
}
func NewStore(port int, publicServer, dirname string, volumeListString string) (s *Store) {
s = &Store{Port: port, PublicServer: publicServer, dir: dirname}
func NewStore(port int, publicUrl, dirname string, volumeListString string) (s *Store) {
s = &Store{Port: port, PublicUrl: publicUrl, dir: dirname}
s.volumes = make(map[uint64]*Volume)
for _, range_string := range strings.Split(volumeListString, ",") {
@@ -74,7 +74,7 @@ func (s *Store) Join(mserver string) {
bytes, _ := json.Marshal(stats)
values := make(url.Values)
values.Add("port", strconv.Itoa(s.Port))
values.Add("publicServer", s.PublicServer)
values.Add("publicUrl", s.PublicUrl)
values.Add("volumes", string(bytes))
log.Println("Exiting volumes", string(bytes))
util.Post("http://"+mserver+"/dir/join", values)