johanels/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-11 22:14:05 +01:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

rc: add support for Go 1.6

Browse Source
This commit is contained in:
remusb
2018-03-14 21:48:01 +02:00
committed by Remus Bunduc
parent 86e5a35491
commit 97b48cf988
4 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fs/rc/rc.go
View File

@@ -62,17 +62,6 @@ func (s *server) serve() {
s.srv.Serve()
}
// writes JSON in out to w
func writeJSON(w http.ResponseWriter, out Params) {
enc := json.NewEncoder(w)
enc.SetIndent("", "\t")
err := enc.Encode(out)
if err != nil {
// can't return the error at this point
fs.Errorf(nil, "rc: failed to write JSON output: %v", err)
}
}
// handler reads incoming requests and dispatches them
func (s *server) handler(w http.ResponseWriter, r *http.Request) {
path := strings.Trim(r.URL.Path, "/")
@@ -81,10 +70,14 @@ func (s *server) handler(w http.ResponseWriter, r *http.Request) {
writeError := func(err error, status int) {
fs.Errorf(nil, "rc: %q: error: %v", path, err)
w.WriteHeader(status)
writeJSON(w, Params{
err = WriteJSON(w, Params{
"error": err.Error(),
"input": in,
})
if err != nil {
// can't return the error at this point
fs.Errorf(nil, "rc: failed to write JSON output: %v", err)
}
}
if r.Method != "POST" {
@@ -131,5 +124,9 @@ func (s *server) handler(w http.ResponseWriter, r *http.Request) {
}
fs.Debugf(nil, "rc: %q: reply %+v: %v", path, out, err)
writeJSON(w, out)
err = WriteJSON(w, out)
if err != nil {
// can't return the error at this point
fs.Errorf(nil, "rc: failed to write JSON output: %v", err)
}
}