From dd5661b2976750bd142a3ccc1ac217500ca41ccc Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Mon, 28 May 2018 02:35:58 -0700
Subject: [PATCH] adding favicon to filer also

---
 weed/server/common.go                      | 13 +++++++++++++
 weed/server/filer_server.go                |  1 +
 weed/server/volume_server.go               |  2 +-
 weed/server/volume_server_handlers.go      |  4 ----
 weed/server/volume_server_handlers_read.go | 12 ------------
 5 files changed, 15 insertions(+), 17 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)
+	}
+}
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go
index a1dc91650..3e175e960 100644
--- a/weed/server/filer_server.go
+++ b/weed/server/filer_server.go
@@ -53,6 +53,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, ip string, port int,
 	fs.filer.LoadConfiguration()
 
 	defaultMux.HandleFunc("/admin/register", fs.registerHandler)
+	defaultMux.HandleFunc("/favicon.ico", faviconHandler)
 	defaultMux.HandleFunc("/", fs.filerHandler)
 	if defaultMux != readonlyMux {
 		readonlyMux.HandleFunc("/", fs.readonlyFilerHandler)
diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go
index b0620de0b..0b7e09c59 100644
--- a/weed/server/volume_server.go
+++ b/weed/server/volume_server.go
@@ -67,7 +67,7 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string,
 	adminMux.HandleFunc("/", vs.privateStoreHandler)
 	if publicMux != adminMux {
 		// separated admin and public port
-		publicMux.HandleFunc("/favicon.ico", vs.faviconHandler)
+		publicMux.HandleFunc("/favicon.ico", faviconHandler)
 		publicMux.HandleFunc("/", vs.publicReadOnlyHandler)
 	}
 
diff --git a/weed/server/volume_server_handlers.go b/weed/server/volume_server_handlers.go
index 2d6fe7849..6ef79dcdb 100644
--- a/weed/server/volume_server_handlers.go
+++ b/weed/server/volume_server_handlers.go
@@ -51,7 +51,3 @@ func (vs *VolumeServer) publicReadOnlyHandler(w http.ResponseWriter, r *http.Req
 		vs.GetOrHeadHandler(w, r)
 	}
 }
-
-func (vs *VolumeServer) faviconHandler(w http.ResponseWriter, r *http.Request) {
-	vs.FaviconHandler(w, r)
-}
diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go
index 9b0fee4eb..a90d4c0e2 100644
--- a/weed/server/volume_server_handlers_read.go
+++ b/weed/server/volume_server_handlers_read.go
@@ -151,18 +151,6 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
 	}
 }
 
-func (vs *VolumeServer) 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)
-	}
-}
-
 func (vs *VolumeServer) tryHandleChunkedFile(n *storage.Needle, fileName string, w http.ResponseWriter, r *http.Request) (processed bool) {
 	if !n.IsChunkedManifest() || r.URL.Query().Get("cm") == "false" {
 		return false