jinql
/
goproxy
mirror of https://github.com/goproxyio/goproxy
1
0
Fork 0
Code Issues Releases Wiki Activity

refactoring code

pull/25/head
nafisfaysal 2018-12-26 07:33:46 +06:00 committed by kun
parent 4b5758264e
commit 1ff5252114
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/proxy/proxy.go
View File

@ -37,13 +37,13 @@ func NewProxy(cache string) http.Handler {
version := strings.TrimSuffix(mod[1], suffix) version := strings.TrimSuffix(mod[1], suffix)
version, err = module.DecodeVersion(version) version, err = module.DecodeVersion(version)
if err != nil { if err != nil {
ReturnServerError(w, err) ReturnInternalServerError(w, err)
return return
} }
modPath := strings.TrimPrefix(mod[0], "/") modPath := strings.TrimPrefix(mod[0], "/")
modPath, err := module.DecodePath(modPath) modPath, err := module.DecodePath(modPath)
if err != nil { if err != nil {
ReturnServerError(w, err) ReturnInternalServerError(w, err)
return return
} }
// ignore the error, incorrect tag may be given // ignore the error, incorrect tag may be given
@ -59,13 +59,13 @@ func NewProxy(cache string) http.Handler {
modPath = strings.TrimPrefix(modPath, "/") modPath = strings.TrimPrefix(modPath, "/")
modPath, err := module.DecodePath(modPath) modPath, err := module.DecodePath(modPath)
if err != nil { if err != nil {
ReturnServerError(w, err) ReturnInternalServerError(w, err)
return return
} }
repo, err := modfetch.Lookup(modPath) repo, err := modfetch.Lookup(modPath)
if err != nil { if err != nil {
errLogger.Printf("lookup failed: %v", err) errLogger.Printf("lookup failed: %v", err)
ReturnServerError(w, err) ReturnInternalServerError(w, err)
return return
} }
rev, err := repo.Stat("latest") rev, err := repo.Stat("latest")

6
pkg/proxy/response.go
View File

@ -9,15 +9,15 @@ import (
var errLogger = log.New(os.Stderr, "", log.LstdFlags) var errLogger = log.New(os.Stderr, "", log.LstdFlags)
func ReturnServerError(w http.ResponseWriter, err error) { func ReturnInternalServerError(w http.ResponseWriter, err error) {
w.WriteHeader(500) w.WriteHeader(http.StatusInternalServerError)
msg := fmt.Sprintf("%v", err) msg := fmt.Sprintf("%v", err)
errLogger.Printf("goproxy: %s\n", msg) errLogger.Printf("goproxy: %s\n", msg)
_, _ = w.Write([]byte(msg)) _, _ = w.Write([]byte(msg))
} }
func ReturnBadRequest(w http.ResponseWriter, err error) { func ReturnBadRequest(w http.ResponseWriter, err error) {
w.WriteHeader(400) w.WriteHeader(http.StatusBadRequest)
msg := fmt.Sprintf("%v", err) msg := fmt.Sprintf("%v", err)
errLogger.Printf("goproxy: %s\n", msg) errLogger.Printf("goproxy: %s\n", msg)
_, _ = w.Write([]byte(msg)) _, _ = w.Write([]byte(msg))