diff options
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_server_handlers_admin.go | 8 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_ui.go | 4 | ||||
| -rw-r--r-- | weed/server/volume_server_ui/templates.go | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/weed/server/volume_server_handlers_admin.go b/weed/server/volume_server_handlers_admin.go index 4d84c9c4d..29bd70d71 100644 --- a/weed/server/volume_server_handlers_admin.go +++ b/weed/server/volume_server_handlers_admin.go @@ -16,7 +16,9 @@ func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) { var ds []*volume_server_pb.DiskStatus for _, loc := range vs.store.Locations { if dir, e := filepath.Abs(loc.Directory); e == nil { - ds = append(ds, stats.NewDiskStatus(dir)) + newDiskStatus := stats.NewDiskStatus(dir) + newDiskStatus.DiskType = loc.GetDiskType() + ds = append(ds, newDiskStatus) } } m["DiskStatuses"] = ds @@ -31,7 +33,9 @@ func (vs *VolumeServer) statsDiskHandler(w http.ResponseWriter, r *http.Request) var ds []*volume_server_pb.DiskStatus for _, loc := range vs.store.Locations { if dir, e := filepath.Abs(loc.Directory); e == nil { - ds = append(ds, stats.NewDiskStatus(dir)) + newDiskStatus := stats.NewDiskStatus(dir) + newDiskStatus.DiskType = loc.GetDiskType() + ds = append(ds, newDiskStatus) } } m["DiskStatuses"] = ds diff --git a/weed/server/volume_server_handlers_ui.go b/weed/server/volume_server_handlers_ui.go index e535327e2..95c7549d2 100644 --- a/weed/server/volume_server_handlers_ui.go +++ b/weed/server/volume_server_handlers_ui.go @@ -19,7 +19,9 @@ func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) var ds []*volume_server_pb.DiskStatus for _, loc := range vs.store.Locations { if dir, e := filepath.Abs(loc.Directory); e == nil { - ds = append(ds, stats.NewDiskStatus(dir)) + newDiskStatus := stats.NewDiskStatus(dir) + newDiskStatus.DiskType = loc.GetDiskType() + ds = append(ds, newDiskStatus) } } volumeInfos := vs.store.VolumeInfos() diff --git a/weed/server/volume_server_ui/templates.go b/weed/server/volume_server_ui/templates.go index 8705bc088..2a93c3441 100644 --- a/weed/server/volume_server_ui/templates.go +++ b/weed/server/volume_server_ui/templates.go @@ -69,6 +69,7 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC <thead> <tr> <th>Path</th> + <th>Type</th> <th>Total</th> <th>Free</th> <th>Usage</th> @@ -78,6 +79,7 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC {{ range .DiskStatuses }} <tr> <td>{{ .Dir }}</td> + <td>{{ .DiskType }}</td> <td>{{ bytesToHumanReadable .All }}</td> <td>{{ bytesToHumanReadable .Free }}</td> <td>{{ percentFrom .All .Used}}%</td> |