Revert "Merge pull request #512 from rqlite/ping_conn"

This reverts commit c1a07a3, reversing
changes made to d16be5f.

http/handlers.go

@@ -13,25 +13,6 @@ import (
 // Handler pattern contained here created by github.com/Merovius
 // See https://blog.merovius.de/2017/06/18/how-not-to-use-an-http-router.html
 
-type pingHandler struct{}
-
-func (h *pingHandler) Handler(connID uint64, s *Service) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		stats.Add(numPings, 1)
-
-		if !s.CheckRequestPerm(r, PermConnections) {
-			w.WriteHeader(http.StatusUnauthorized)
-			return
-		}
-
-		if r.Method != "POST" {
-			w.WriteHeader(http.StatusMethodNotAllowed)
-			return
-		}
-		s.handlePing(connID, w, r)
-	})
-}
-
 type executeHandler struct{}
 
 func (h *executeHandler) Handler(connID uint64, s *Service) http.Handler {
@@ -111,7 +92,6 @@ func (h *loadHandler) Handler(s *Service) http.Handler {
 type connectionsHandler struct {
 	executeH executeHandler
 	queryH   queryHandler
-	pingH    pingHandler
 }
 
 func (h *connectionsHandler) Handler(s *Service) http.Handler {
@@ -152,8 +132,6 @@ func (h *connectionsHandler) Handler(s *Service) http.Handler {
 					h.executeH.Handler(id, s).ServeHTTP(w, r)
 				case "query":
 					h.queryH.Handler(id, s).ServeHTTP(w, r)
-				case "ping":
-					h.pingH.Handler(id, s).ServeHTTP(w, r)
 				default:
 					w.WriteHeader(http.StatusNotFound)
 				}

http/service.go

@@ -118,7 +118,6 @@ var stats *expvar.Map
 
 const (
 	numConnections = "connections"
-	numPings       = "pings"
 	numExecutions  = "executions"
 	numQueries     = "queries"
 	numBackups     = "backups"
@@ -536,19 +535,6 @@ func (s *Service) handleStatus(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// handlePing marks a connection as still in use, without executing any SQL command.
-func (s *Service) handlePing(connID uint64, w http.ResponseWriter, r *http.Request) {
-	if connID == defaultConnID {
-		return
-	}
-	c, ok := s.store.Connection(connID)
-	if !ok {
-		http.Error(w, "connection not found", http.StatusNotFound)
-		return
-	}
-	c.SetLastUsedNow()
-}
-
 // handleExecute handles queries that modify the database.
 func (s *Service) handleExecute(connID uint64, w http.ResponseWriter, r *http.Request) {
 	isAtomic, err := isAtomic(r)

http/service_test.go

@@ -347,7 +347,6 @@ func Test_401Routes_NoBasicAuth(t *testing.T) {
 		"/db/backup",
 		"/db/load",
 		"/db/connections",
-		"/db/connections/1234/pings",
 		"/join",
 		"/delete",
 		"/status",
@@ -389,7 +388,6 @@ func Test_401Routes_BasicAuthBadPassword(t *testing.T) {
 		"/db/backup",
 		"/db/load",
 		"/db/connections",
-		"/db/connections/1234/ping",
 		"/join",
 		"/status",
 		"/debug/vars",
@@ -436,7 +434,6 @@ func Test_401Routes_BasicAuthBadPerm(t *testing.T) {
 		"/db/backup",
 		"/db/load",
 		"/db/connections",
-		"/db/connections/1234/ping",
 		"/join",
 		"/status",
 		"/debug/vars",