multi: use request overrides in RPC proxy

Author: ViktorTigerstrom

rpc_proxy.go

@@ -638,18 +638,17 @@ func (p *rpcProxy) checkSubSystemStarted(requestURI string) error {
 
 	// Check with the status manger to see if the sub-server is ready to
 	// handle the request.
-	serverStatus, err := p.statusMgr.GetStatus(system)
+	ready, disabled, err := p.statusMgr.IsSystemReady(system, requestURI)
 	if err != nil {
 		return err
 	}
 
-	if serverStatus.Disabled {
+	if disabled {
 		return fmt.Errorf("%s has been disabled", system)
 	}
 
-	if !serverStatus.Running {
-		return fmt.Errorf("%s is not running: %s", system,
-			serverStatus.Err)
+	if !ready {
+		return fmt.Errorf("%s is not ready for: %s", system, requestURI)
 	}
 
 	return nil

status/manager.go

@@ -181,21 +181,6 @@ func (s *Manager) SetCustomStatus(name, customStatus string) {
 	ss.customStatus = customStatus
 }
 
-// GetStatus returns the current status of a given sub-server. This will
-// silently fail if the referenced sub-server has not yet been registered.
-func (s *Manager) GetStatus(name string) (*SubServerStatus, error) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	status, ok := s.subServers[name]
-	if !ok {
-		return nil, errors.New("a sub-server with name %s has not " +
-			"yet been registered")
-	}
-
-	return status, nil
-}
-
 // SetEnabled marks the sub-server with the given name as enabled.
 //
 // NOTE: This will silently fail if the referenced sub-server has not yet been