Stowage/rest-server
2
0
Fork 0
mirror of https://github.com/restic/rest-server.git synced 2025-10-19 07:33:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handler cleanup

Browse source
This commit is contained in:
Zlatko Čalušić 2017-05-01 20:01:52 +02:00
parent 661e66849b
commit e2a4dd5dab
1 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

54
handlers.go
View file

@ -120,6 +120,7 @@ func SaveConfig(w http.ResponseWriter, r *http.Request) {
http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest) http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return return
} }
if err := ioutil.WriteFile(cfg, bytes, 0600); err != nil { if err := ioutil.WriteFile(cfg, bytes, 0600); err != nil {
if config.debug { if config.debug {
log.Print(err) log.Print(err)
@ -127,8 +128,6 @@ func SaveConfig(w http.ResponseWriter, r *http.Request) {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return return
} }
w.Write([]byte("200 ok"))
} }
// DeleteConfig removes a config. // DeleteConfig removes a config.
@ -137,21 +136,17 @@ func DeleteConfig(w http.ResponseWriter, r *http.Request) {
log.Println("DeleteConfig()") log.Println("DeleteConfig()")
} }
err := os.Remove(filepath.Join(getRepo(r), "config")) if err := os.Remove(filepath.Join(getRepo(r), "config")); err != nil {
if err == nil { if config.debug {
log.Print(err)
}
if os.IsNotExist(err) {
http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
} else {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
}
return return
} }
if config.debug {
log.Print(err)
}
if os.IsNotExist(err) {
http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
return
}
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
} }
// ListBlobs lists all blobs of a given type in an arbitrary order. // ListBlobs lists all blobs of a given type in an arbitrary order.
@ -294,6 +289,7 @@ func SaveBlob(w http.ResponseWriter, r *http.Request) {
http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest) http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return return
} }
if err := tf.Sync(); err != nil { if err := tf.Sync(); err != nil {
tf.Close() tf.Close()
os.Remove(path) os.Remove(path)
@ -303,6 +299,7 @@ func SaveBlob(w http.ResponseWriter, r *http.Request) {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return return
} }
if err := tf.Close(); err != nil { if err := tf.Close(); err != nil {
os.Remove(path) os.Remove(path)
if config.debug { if config.debug {
@ -311,8 +308,6 @@ func SaveBlob(w http.ResponseWriter, r *http.Request) {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return return
} }
w.Write([]byte("200 ok"))
} }
// DeleteBlob deletes a blob from the repository. // DeleteBlob deletes a blob from the repository.
@ -329,22 +324,17 @@ func DeleteBlob(w http.ResponseWriter, r *http.Request) {
} }
path := filepath.Join(getRepo(r), dir, name) path := filepath.Join(getRepo(r), dir, name)
err := os.Remove(path) if err := os.Remove(path); err != nil {
if err == nil { if config.debug {
w.Write([]byte("200 ok")) log.Print(err)
}
if os.IsNotExist(err) {
http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
} else {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
}
return return
} }
if config.debug {
log.Print(err)
}
if os.IsNotExist(err) {
http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
return
}
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
} }
// CreateRepo creates repository directories. // CreateRepo creates repository directories.
@ -359,6 +349,4 @@ func CreateRepo(w http.ResponseWriter, r *http.Request) {
} }
createDirectories(getRepo(r)) createDirectories(getRepo(r))
w.Write([]byte("200 ok"))
} }