forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/api: get rid of logError and logDebug layer of indirection

Browse source
This commit is contained in:
Anton Evangelatov 2018-02-09 17:43:45 +01:00
parent 4a0bf28985
commit 339270391b
1 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
swarm/api/http/server.go
View file

@ -104,7 +104,7 @@ func (s *Server) HandlePostRaw(w http.ResponseWriter, r *Request) {
s.Error(w, r, err) s.Error(w, r, err)
return return
} }
s.logDebug("content for %s stored", key.Log()) log.Debug(fmt.Sprintf("content for %s stored", key.Log()))
w.Header().Set("Content-Type", "text/plain") w.Header().Set("Content-Type", "text/plain")
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
@ -185,12 +185,12 @@ func (s *Server) handleTarUpload(req *Request, mw *api.ManifestWriter) error {
Size: hdr.Size, Size: hdr.Size,
ModTime: hdr.ModTime, ModTime: hdr.ModTime,
} }
s.logDebug("adding %s (%d bytes) to new manifest", entry.Path, entry.Size) log.Debug(fmt.Sprintf("adding %s (%d bytes) to new manifest", entry.Path, entry.Size))
contentKey, err := mw.AddEntry(tr, entry) contentKey, err := mw.AddEntry(tr, entry)
if err != nil { if err != nil {
return fmt.Errorf("error adding manifest entry from tar stream: %s", err) return fmt.Errorf("error adding manifest entry from tar stream: %s", err)
} }
s.logDebug("content for %s stored", contentKey.Log()) log.Debug(fmt.Sprintf("content for %s stored", contentKey.Log()))
} }
} }
@ -242,12 +242,12 @@ func (s *Server) handleMultipartUpload(req *Request, boundary string, mw *api.Ma
Size: size, Size: size,
ModTime: time.Now(), ModTime: time.Now(),
} }
s.logDebug("adding %s (%d bytes) to new manifest", entry.Path, entry.Size) log.Debug(fmt.Sprintf("adding %s (%d bytes) to new manifest", entry.Path, entry.Size))
contentKey, err := mw.AddEntry(reader, entry) contentKey, err := mw.AddEntry(reader, entry)
if err != nil { if err != nil {
return fmt.Errorf("error adding manifest entry from multipart form: %s", err) return fmt.Errorf("error adding manifest entry from multipart form: %s", err)
} }
s.logDebug("content for %s stored", contentKey.Log()) log.Debug(fmt.Sprintf("content for %s stored", contentKey.Log()))
} }
} }
@ -262,7 +262,7 @@ func (s *Server) handleDirectUpload(req *Request, mw *api.ManifestWriter) error
if err != nil { if err != nil {
return err return err
} }
s.logDebug("content for %s stored", key.Log()) log.Debug(fmt.Sprintf("content for %s stored", key.Log()))
return nil return nil
} }
@ -277,7 +277,7 @@ func (s *Server) HandleDelete(w http.ResponseWriter, r *Request) {
} }
newKey, err := s.updateManifest(key, func(mw *api.ManifestWriter) error { newKey, err := s.updateManifest(key, func(mw *api.ManifestWriter) error {
s.logDebug("removing %s from manifest %s", r.uri.Path, key.Log()) log.Debug(fmt.Sprintf("removing %s from manifest %s", r.uri.Path, key.Log()))
return mw.RemoveEntry(r.uri.Path) return mw.RemoveEntry(r.uri.Path)
}) })
if err != nil { if err != nil {
@ -430,7 +430,7 @@ func (s *Server) HandleGetFiles(w http.ResponseWriter, r *Request) {
return nil return nil
}) })
if err != nil { if err != nil {
s.logError("error generating tar stream: %s", err) log.Error(fmt.Sprintf("error generating tar stream: %s", err))
} }
} }
@ -470,7 +470,7 @@ func (s *Server) HandleGetList(w http.ResponseWriter, r *Request) {
List: &list, List: &list,
}) })
if err != nil { if err != nil {
s.logError("error rendering list HTML: %s", err) log.Error(fmt.Sprintf("error rendering list HTML: %s", err))
} }
return return
} }
@ -571,7 +571,7 @@ func (s *Server) HandleGetFile(w http.ResponseWriter, r *Request) {
return return
} }
s.logDebug(fmt.Sprintf("Multiple choices! --> %v", list)) log.Debug(fmt.Sprintf("Multiple choices! --> %v", list))
//show a nice page links to available entries //show a nice page links to available entries
ShowMultipleChoices(w, &r.Request, list) ShowMultipleChoices(w, &r.Request, list)
return return
@ -589,16 +589,16 @@ func (s *Server) HandleGetFile(w http.ResponseWriter, r *Request) {
} }
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
s.logDebug("HTTP %s request URL: '%s', Host: '%s', Path: '%s', Referer: '%s', Accept: '%s'", r.Method, r.RequestURI, r.URL.Host, r.URL.Path, r.Referer(), r.Header.Get("Accept")) log.Debug(fmt.Sprintf("HTTP %s request URL: '%s', Host: '%s', Path: '%s', Referer: '%s', Accept: '%s'", r.Method, r.RequestURI, r.URL.Host, r.URL.Path, r.Referer(), r.Header.Get("Accept")))
uri, err := api.Parse(strings.TrimLeft(r.URL.Path, "/")) uri, err := api.Parse(strings.TrimLeft(r.URL.Path, "/"))
req := &Request{Request: *r, uri: uri} req := &Request{Request: *r, uri: uri}
if err != nil { if err != nil {
s.logError("Invalid URI %q: %s", r.URL.Path, err) log.Error(fmt.Sprintf("Invalid URI %q: %s", r.URL.Path, err))
s.BadRequest(w, req, fmt.Sprintf("Invalid URI %q: %s", r.URL.Path, err)) s.BadRequest(w, req, fmt.Sprintf("Invalid URI %q: %s", r.URL.Path, err))
return return
} }
s.logDebug("%s request received for %s", r.Method, uri) log.Debug(fmt.Sprintf("%s request received for %s", r.Method, uri))
switch r.Method { switch r.Method {
case "POST": case "POST":
@ -666,18 +666,10 @@ func (s *Server) updateManifest(key storage.Key, update func(mw *api.ManifestWri
if err != nil { if err != nil {
return nil, err return nil, err
} }
s.logDebug("generated manifest %s", key) log.Debug(fmt.Sprintf("generated manifest %s", key))
return key, nil return key, nil
} }
func (s *Server) logDebug(format string, v ...interface{}) {
log.Debug(fmt.Sprintf("[BZZ] HTTP: "+format, v...))
}
func (s *Server) logError(format string, v ...interface{}) {
log.Error(fmt.Sprintf("[BZZ] HTTP: "+format, v...))
}
func (s *Server) BadRequest(w http.ResponseWriter, r *Request, reason string) { func (s *Server) BadRequest(w http.ResponseWriter, r *Request, reason string) {
ShowError(w, &r.Request, fmt.Sprintf("Bad request %s %s: %s", r.Method, r.uri, reason), http.StatusBadRequest) ShowError(w, &r.Request, fmt.Sprintf("Bad request %s %s: %s", r.Method, r.uri, reason), http.StatusBadRequest)
} }