mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-24 02:59:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

more consistent server header for s3 apis

Browse Source
This commit is contained in:
chrislu 2024-09-09 09:07:55 -07:00
parent d8e18a8eb7
commit 43d9f68219
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
weed/s3api/stats.go
View File

@ -3,6 +3,7 @@ package s3api
import (
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
stats_collect "github.com/seaweedfs/seaweedfs/weed/stats"
"github.com/seaweedfs/seaweedfs/weed/util"
"net/http"
"strconv"
"time"
@ -11,7 +12,7 @@ import (
func track(f http.HandlerFunc, action string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
bucket, _ := s3_constants.GetBucketAndObject(r)
w.Header().Set("Server", "SeaweedFS S3")
w.Header().Set("Server", "SeaweedFS "+util.VERSION)
recorder := stats_collect.NewStatusResponseWriter(w)
start := time.Now()
f(recorder, r)

6
weed/server/filer_server_handlers.go
View File

@ -75,7 +75,7 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) {
return
}
w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION)
w.Header().Set("Server", "SeaweedFS "+util.VERSION)
switch r.Method {
case http.MethodGet, http.MethodHead:
@ -163,7 +163,7 @@ func (fs *FilerServer) readonlyFilerHandler(w http.ResponseWriter, r *http.Reque
return
}
w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION)
w.Header().Set("Server", "SeaweedFS "+util.VERSION)
switch r.Method {
case http.MethodGet, http.MethodHead:
@ -224,7 +224,7 @@ func (fs *FilerServer) maybeCheckJwtAuthorization(r *http.Request, isWrite bool)
}
func (fs *FilerServer) filerHealthzHandler(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION)
w.Header().Set("Server", "SeaweedFS "+util.VERSION)
if _, err := fs.filer.Store.FindEntry(context.Background(), filer.TopicsDir); err != nil && err != filer_pb.ErrNotFound {
glog.Warningf("filerHealthzHandler FindEntry: %+v", err)
w.WriteHeader(http.StatusServiceUnavailable)