make sure everything is stopped before closing db and redis pools

backends/rapidpro/backend.go

@@ -383,18 +383,18 @@ func (b *backend) Start() error {
 
 // Stop stops our RapidPro backend, closing our db and redis connections
 func (b *backend) Stop() error {
-	if b.db != nil {
-		b.db.Close()
-	}
-
-	b.redisPool.Close()
-
 	// close our stop channel
 	close(b.stopChan)
 
 	// wait for our threads to exit
 	b.waitGroup.Wait()
 
+	// close our db and redis pool
+	if b.db != nil {
+		b.db.Close()
+	}
+	b.redisPool.Close()
+
 	return nil
 }
 

server.go

@@ -163,15 +163,16 @@ func (s *server) Stop() error {
 		log.WithField("state", "stopping").WithError(err).Error("error shutting down server")
 	}
 
+	// stop everything
+	s.stopped = true
+	close(s.stopChan)
+
 	// stop our backend
 	err := s.backend.Stop()
 	if err != nil {
 		return err
 	}
 
-	s.stopped = true
-	close(s.stopChan)
-
 	// stop our librato sender
 	librato.Default.Stop()