f-21: debug: use err correct returne for kv db
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
921a5ca96e
commit
6b104c4784
5 changed files with 25 additions and 7 deletions
|
|
@ -69,7 +69,12 @@ func (s *Server) deleteSubnet(w http.ResponseWriter, _ *http.Request, name strin
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
s.dispatcher.Dispatch(cmd)
|
s.dispatcher.Dispatch(cmd)
|
||||||
state, _ := kv.GetFromDB(s.db, "subnet/"+name+"/state")
|
state, err := kv.GetFromDB(s.db, "subnet/"+name+"/state")
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
json.NewEncoder(w).Encode(ErrorResponse{Error: "failed to read subnet state"})
|
||||||
|
return
|
||||||
|
}
|
||||||
w.WriteHeader(http.StatusAccepted)
|
w.WriteHeader(http.StatusAccepted)
|
||||||
json.NewEncoder(w).Encode(Subnet{Name: name, State: state})
|
json.NewEncoder(w).Encode(Subnet{Name: name, State: state})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,12 @@ func (s *Server) postSubnet(w http.ResponseWriter, r *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
s.dispatcher.Dispatch(cmd)
|
s.dispatcher.Dispatch(cmd)
|
||||||
entries, _ := kv.ListByPrefix(s.db, "subnet/"+req.Name+"/")
|
entries, err := kv.ListByPrefix(s.db, "subnet/"+req.Name+"/")
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
json.NewEncoder(w).Encode(ErrorResponse{Error: "failed to read subnet state"})
|
||||||
|
return
|
||||||
|
}
|
||||||
sub := Subnet{Name: req.Name}
|
sub := Subnet{Name: req.Name}
|
||||||
for key, value := range entries {
|
for key, value := range entries {
|
||||||
parts := strings.Split(key, "/")
|
parts := strings.Split(key, "/")
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,12 @@ func (s *Server) deleteVpc(w http.ResponseWriter, _ *http.Request, name string)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
s.dispatcher.Dispatch(cmd)
|
s.dispatcher.Dispatch(cmd)
|
||||||
state, _ := kv.GetFromDB(s.db, "vpc/"+name+"/state")
|
state, err := kv.GetFromDB(s.db, "vpc/"+name+"/state")
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
json.NewEncoder(w).Encode(ErrorResponse{Error: "failed to read vpc state"})
|
||||||
|
return
|
||||||
|
}
|
||||||
w.WriteHeader(http.StatusAccepted)
|
w.WriteHeader(http.StatusAccepted)
|
||||||
json.NewEncoder(w).Encode(VPC{Name: name, State: state})
|
json.NewEncoder(w).Encode(VPC{Name: name, State: state})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,12 @@ func (s *Server) postVpc(w http.ResponseWriter, r *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
s.dispatcher.Dispatch(cmd)
|
s.dispatcher.Dispatch(cmd)
|
||||||
state, _ := kv.GetFromDB(s.db, "vpc/"+req.Name+"/state")
|
state, err := kv.GetFromDB(s.db, "vpc/"+req.Name+"/state")
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
json.NewEncoder(w).Encode(ErrorResponse{Error: "failed to read vpc state"})
|
||||||
|
return
|
||||||
|
}
|
||||||
w.WriteHeader(http.StatusAccepted)
|
w.WriteHeader(http.StatusAccepted)
|
||||||
json.NewEncoder(w).Encode(VPC{Name: req.Name, State: state})
|
json.NewEncoder(w).Encode(VPC{Name: req.Name, State: state})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
package kv
|
package kv
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
|
||||||
|
|
||||||
"github.com/dgraph-io/badger/v4"
|
"github.com/dgraph-io/badger/v4"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -35,7 +33,7 @@ func DeleteInDB(db *badger.DB, key string) error {
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return deleteKey(db, key)
|
return deleteKey(db, key)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue