fluidB
/
fluidb-old
1
0
Fork 0
Code Pull Requests Activity

Fix variable naming

Browse Source
master
Philip O'Toole 4 years ago
parent 231b99b1a0
commit bbc8681b4d
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

30
http/service.go
Unescape Escape View File

@ -326,14 +326,14 @@ func (s *Service) handleJoin(w http.ResponseWriter, r *http.Request) {
if err := s.store.Join(remoteID.(string), remoteAddr.(string), voter.(bool), m); err != nil { if err := s.store.Join(remoteID.(string), remoteAddr.(string), voter.(bool), m); err != nil {
if err == store.ErrNotLeader { if err == store.ErrNotLeader {
LeaderAPIAddr := s.LeaderAPIAddr() leaderAPIAddr := s.LeaderAPIAddr()
leaderProto := s.LeaderAPIProto() leaderProto := s.LeaderAPIProto()
if LeaderAPIAddr == "" { if leaderAPIAddr == "" {
http.Error(w, err.Error(), http.StatusServiceUnavailable) http.Error(w, err.Error(), http.StatusServiceUnavailable)
return return
} }
redirect := s.FormRedirect(r, leaderProto, LeaderAPIAddr) redirect := s.FormRedirect(r, leaderProto, leaderAPIAddr)
http.Redirect(w, r, redirect, http.StatusMovedPermanently) http.Redirect(w, r, redirect, http.StatusMovedPermanently)
return return
} }
@ -381,14 +381,14 @@ func (s *Service) handleRemove(w http.ResponseWriter, r *http.Request) {
if err := s.store.Remove(remoteID); err != nil { if err := s.store.Remove(remoteID); err != nil {
if err == store.ErrNotLeader { if err == store.ErrNotLeader {
LeaderAPIAddr := s.LeaderAPIAddr() leaderAPIAddr := s.LeaderAPIAddr()
leaderProto := s.LeaderAPIProto() leaderProto := s.LeaderAPIProto()
if LeaderAPIAddr == "" { if leaderAPIAddr == "" {
http.Error(w, err.Error(), http.StatusServiceUnavailable) http.Error(w, err.Error(), http.StatusServiceUnavailable)
return return
} }
redirect := s.FormRedirect(r, leaderProto, LeaderAPIAddr) redirect := s.FormRedirect(r, leaderProto, leaderAPIAddr)
http.Redirect(w, r, redirect, http.StatusMovedPermanently) http.Redirect(w, r, redirect, http.StatusMovedPermanently)
return return
} }
@ -462,14 +462,14 @@ func (s *Service) handleLoad(w http.ResponseWriter, r *http.Request) {
results, err := s.store.ExecuteOrAbort(&store.ExecuteRequest{queries, timings, false}) results, err := s.store.ExecuteOrAbort(&store.ExecuteRequest{queries, timings, false})
if err != nil { if err != nil {
if err == store.ErrNotLeader { if err == store.ErrNotLeader {
LeaderAPIAddr := s.LeaderAPIAddr() leaderAPIAddr := s.LeaderAPIAddr()
leaderProto := s.LeaderAPIProto() leaderProto := s.LeaderAPIProto()
if LeaderAPIAddr == "" { if leaderAPIAddr == "" {
http.Error(w, err.Error(), http.StatusServiceUnavailable) http.Error(w, err.Error(), http.StatusServiceUnavailable)
return return
} }
redirect := s.FormRedirect(r, leaderProto, LeaderAPIAddr) redirect := s.FormRedirect(r, leaderProto, leaderAPIAddr)
http.Redirect(w, r, redirect, http.StatusMovedPermanently) http.Redirect(w, r, redirect, http.StatusMovedPermanently)
return return
} }
@ -610,14 +610,14 @@ func (s *Service) handleExecute(w http.ResponseWriter, r *http.Request) {
results, err := s.store.Execute(&store.ExecuteRequest{queries, timings, isTx}) results, err := s.store.Execute(&store.ExecuteRequest{queries, timings, isTx})
if err != nil { if err != nil {
if err == store.ErrNotLeader { if err == store.ErrNotLeader {
LeaderAPIAddr := s.LeaderAPIAddr() leaderAPIAddr := s.LeaderAPIAddr()
leaderProto := s.LeaderAPIProto() leaderProto := s.LeaderAPIProto()
if LeaderAPIAddr == "" { if leaderAPIAddr == "" {
http.Error(w, err.Error(), http.StatusServiceUnavailable) http.Error(w, err.Error(), http.StatusServiceUnavailable)
return return
} }
redirect := s.FormRedirect(r, leaderProto, LeaderAPIAddr) redirect := s.FormRedirect(r, leaderProto, leaderAPIAddr)
http.Redirect(w, r, redirect, http.StatusMovedPermanently) http.Redirect(w, r, redirect, http.StatusMovedPermanently)
return return
} }
@ -679,14 +679,14 @@ func (s *Service) handleQuery(w http.ResponseWriter, r *http.Request) {
results, err := s.store.Query(&store.QueryRequest{queries, timings, isTx, lvl, frsh}) results, err := s.store.Query(&store.QueryRequest{queries, timings, isTx, lvl, frsh})
if err != nil { if err != nil {
if err == store.ErrNotLeader { if err == store.ErrNotLeader {
LeaderAPIAddr := s.LeaderAPIAddr() leaderAPIAddr := s.LeaderAPIAddr()
leaderProto := s.LeaderAPIProto() leaderProto := s.LeaderAPIProto()
if LeaderAPIAddr == "" { if leaderAPIAddr == "" {
http.Error(w, err.Error(), http.StatusServiceUnavailable) http.Error(w, err.Error(), http.StatusServiceUnavailable)
return return
} }
redirect := s.FormRedirect(r, leaderProto, LeaderAPIAddr) redirect := s.FormRedirect(r, leaderProto, leaderAPIAddr)
http.Redirect(w, r, redirect, http.StatusMovedPermanently) http.Redirect(w, r, redirect, http.StatusMovedPermanently)
return return
} }

Write Preview
Loading…
Cancel
Save