diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-06-02 00:35:03 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-06-02 00:35:03 -0700 |
| commit | c546c309f10154688431433c031d62dc20edfc85 (patch) | |
| tree | 69670656b3f740cd1f05e8fe646d2cae51c9aff5 /weed/server/common.go | |
| parent | 3a3553dc463a8f5f5739b58e325da4f14650517b (diff) | |
| parent | a146a48ccc16848a9c2f24b64864e9566db8ab7c (diff) | |
| download | seaweedfs-c546c309f10154688431433c031d62dc20edfc85.tar.xz seaweedfs-c546c309f10154688431433c031d62dc20edfc85.zip | |
Merge branch 'filer2_development'
Diffstat (limited to 'weed/server/common.go')
| -rw-r--r-- | weed/server/common.go | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/weed/server/common.go b/weed/server/common.go index 20177df0e..85d052993 100644 --- a/weed/server/common.go +++ b/weed/server/common.go @@ -12,6 +12,7 @@ import ( "time" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/images" "github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/stats" @@ -188,3 +189,15 @@ func statsMemoryHandler(w http.ResponseWriter, r *http.Request) { m["Memory"] = stats.MemStat() writeJsonQuiet(w, r, http.StatusOK, m) } + +func faviconHandler(w http.ResponseWriter, r *http.Request) { + data, err := images.Asset("favicon/favicon.ico") + if err != nil { + glog.V(2).Infoln("favicon read error:", err) + return + } + + if e := writeResponseContent("favicon.ico", "image/x-icon", bytes.NewReader(data), w, r); e != nil { + glog.V(2).Infoln("response write error:", e) + } +} |