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

clean error log

pull/4/head
kun 2018-09-05 13:31:00 +08:00
parent 383fb33888
commit 9a38b201ef
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.go
View File

@ -37,10 +37,10 @@ func main() {
func mainHandler(inner http.Handler) http.Handler { func mainHandler(inner http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(os.Stdout, "goproxy: download %s\n", r.URL.Path)
if _, err := os.Stat(filepath.Join(cacheDir, r.URL.Path)); err != nil { if _, err := os.Stat(filepath.Join(cacheDir, r.URL.Path)); err != nil {
var suffix string
if strings.HasSuffix(r.URL.Path, ".info") || strings.HasSuffix(r.URL.Path, ".mod") { if strings.HasSuffix(r.URL.Path, ".info") || strings.HasSuffix(r.URL.Path, ".mod") {
suffix = ".mod" suffix := ".mod"
if strings.HasSuffix(r.URL.Path, ".info") { if strings.HasSuffix(r.URL.Path, ".info") {
suffix = ".info" suffix = ".info"
} }
@ -66,7 +66,6 @@ func mainHandler(inner http.Handler) http.Handler {
goGet(path, version, suffix, w, r) goGet(path, version, suffix, w, r)
} }
if strings.HasSuffix(r.URL.Path, "/@v/list") { if strings.HasSuffix(r.URL.Path, "/@v/list") {
w.WriteHeader(200)
w.Write([]byte("")) w.Write([]byte(""))
return return
} }
@ -96,13 +95,13 @@ func goGet(path, version, suffix string, w http.ResponseWriter, r *http.Request)
return err return err
} }
bytesOut, err := ioutil.ReadAll(stdout) _, err = ioutil.ReadAll(stdout)
if err != nil { if err != nil {
return err return err
} }
if err := cmd.Wait(); err != nil { if err := cmd.Wait(); err != nil {
fmt.Fprintf(os.Stdout, "goproxy: download %s stdout: %s stderr: %s\n", path, string(bytesOut), string(bytesErr)) fmt.Fprintf(os.Stderr, "goproxy: download %s stderr:\n %s", path, string(bytesErr))
return err return err
} }
out := fmt.Sprintf("%s", bytesErr) out := fmt.Sprintf("%s", bytesErr)

2
response.go
View File

@ -3,10 +3,12 @@ package main
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"os"
) )
func ReturnServerError(w http.ResponseWriter, err error) { func ReturnServerError(w http.ResponseWriter, err error) {
w.WriteHeader(500) w.WriteHeader(500)
msg := fmt.Sprintf("%v", err) msg := fmt.Sprintf("%v", err)
fmt.Fprintf(os.Stderr, "goproxy: %s\n", msg)
w.Write([]byte(msg)) w.Write([]byte(msg))
} }