From 0834055a1bcff39c7a0184e9c7541d754901e711 Mon Sep 17 00:00:00 2001 From: micbou Date: Sun, 17 Jan 2016 18:39:37 +0100 Subject: [PATCH] =?UTF-8?q?Change=20ServerIs*=20semantics=20in=20C?= =?UTF-8?q?=E2=99=AF=20completer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename ServerIs* methods to correspond to ycmd handlers /healthy and /ready. Rename ServerIsActive to ServerIsRunning. Simplify these methods by removing the request_data parameter, which is never used. --- ycmd/completers/cs/cs_completer.py | 61 ++++++++++++------------------ ycmd/handlers.py | 2 +- ycmd/tests/cs/cs_handlers_test.py | 2 +- 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/ycmd/completers/cs/cs_completer.py b/ycmd/completers/cs/cs_completer.py index aeca8d9b96..4c144a38c5 100755 --- a/ycmd/completers/cs/cs_completer.py +++ b/ycmd/completers/cs/cs_completer.py @@ -201,15 +201,15 @@ def GetSubcommandsMap( self ): 'GetDoc' : ( lambda self, request_data, args: self._SolutionSubcommand( request_data, method = '_GetDoc' ) ), - 'ServerIsActive' : ( lambda self, request_data, args: + 'ServerIsRunning' : ( lambda self, request_data, args: self._SolutionSubcommand( request_data, - method = 'ServerIsActive', + method = 'ServerIsRunning', no_request_data = True ) ), - 'ServerRunning' : ( lambda self, request_data, args: + 'ServerIsHealthy' : ( lambda self, request_data, args: self._SolutionSubcommand( request_data, - method = 'ServerIsRunning', + method = 'ServerIsHealthy', no_request_data = True ) ), - 'ServerReady' : ( lambda self, request_data, args: + 'ServerIsReady' : ( lambda self, request_data, args: self._SolutionSubcommand( request_data, method = 'ServerIsReady', no_request_data = True ) ) @@ -230,13 +230,13 @@ def OnFileReadyToParse( self, request_data ): # Only start the server associated to this solution if the option to # automatically start one is set and no server process is already running. if ( self.user_options[ 'auto_start_csharp_server' ] - and not solutioncompleter.ServerIsActive() ): + and not solutioncompleter.ServerIsRunning() ): solutioncompleter._StartServer() return # Bail out if the server is unresponsive. We don't start or restart the # server in this case because current one may still be warming up. - if not solutioncompleter.ServerIsRunning(): + if not solutioncompleter.ServerIsHealthy(): return errors = solutioncompleter.CodeCheck( request_data ) @@ -300,32 +300,21 @@ def DebugInfo( self, request_data ): return 'OmniSharp Server is not running' - def ServerIsActive( self, request_data = None ): - """ Check if the server process is active. """ - return self._CheckSingleOrAllActive( request_data, - lambda i: i.ServerIsActive() ) - + def ServerIsHealthy( self ): + """ Check if our OmniSharp server is healthy (up and serving). """ + return self._CheckAllRunning( lambda i: i.ServerIsHealthy() ) - def ServerIsRunning( self, request_data = None ): - """ Check if our OmniSharp server is running. """ - return self._CheckSingleOrAllActive( request_data, - lambda i: i.ServerIsRunning() ) - - def ServerIsReady( self, request_data = None ): + def ServerIsReady( self ): """ Check if our OmniSharp server is ready (loaded solution file).""" - return self._CheckSingleOrAllActive( request_data, - lambda i: i.ServerIsReady() ) + return self._CheckAllRunning( lambda i: i.ServerIsReady() ) - def _CheckSingleOrAllActive( self, request_data, action ): - if request_data is not None: - solutioncompleter = self._GetSolutionCompleter( request_data ) - return action( solutioncompleter ) - else: - solutioncompleters = self._completer_per_solution.values() - return all( action( completer ) - for completer in solutioncompleters if completer.ServerIsActive() ) + def _CheckAllRunning( self, action ): + solutioncompleters = self._completer_per_solution.values() + self._logger.info( solutioncompleters ) + return all( action( completer ) for completer in solutioncompleters + if completer.ServerIsRunning() ) def _GetSolutionFile( self, filepath ): @@ -409,7 +398,7 @@ def _StopServer( self ): self._TryToStopServer() # Kill it if it's still up - if self.ServerIsActive(): + if self.ServerIsRunning(): self._logger.info( 'Killing OmniSharp server' ) self._omnisharp_phandle.kill() @@ -425,7 +414,7 @@ def _TryToStopServer( self ): except: pass for _ in range( 10 ): - if not self.ServerIsActive(): + if not self.ServerIsRunning(): return time.sleep( .1 ) @@ -553,14 +542,14 @@ def _DefaultParameters( self, request_data ): return parameters - def ServerIsActive( self ): - """ Check if our OmniSharp server is active (started, not yet stopped).""" + def ServerIsRunning( self ): + """ Check if our OmniSharp server is running (process is up).""" return utils.ProcessIsRunning( self._omnisharp_phandle ) - def ServerIsRunning( self ): - """ Check if our OmniSharp server is running (up and serving).""" - if not self.ServerIsActive(): + def ServerIsHealthy( self ): + """ Check if our OmniSharp server is healthy (up and serving).""" + if not self.ServerIsRunning(): return False try: @@ -571,7 +560,7 @@ def ServerIsRunning( self ): def ServerIsReady( self ): """ Check if our OmniSharp server is ready (loaded solution file).""" - if not self.ServerIsActive(): + if not self.ServerIsRunning(): return False try: diff --git a/ycmd/handlers.py b/ycmd/handlers.py index fd1d4e3f37..a4d3798e5d 100644 --- a/ycmd/handlers.py +++ b/ycmd/handlers.py @@ -131,7 +131,7 @@ def GetHealthy(): _logger.info( 'Received health request' ) if request.query.include_subservers: cs_completer = _server_state.GetFiletypeCompleter( ['cs'] ) - return _JsonResponse( cs_completer.ServerIsRunning() ) + return _JsonResponse( cs_completer.ServerIsHealthy() ) return _JsonResponse( True ) diff --git a/ycmd/tests/cs/cs_handlers_test.py b/ycmd/tests/cs/cs_handlers_test.py index dea9fcd126..8e91e7a429 100644 --- a/ycmd/tests/cs/cs_handlers_test.py +++ b/ycmd/tests/cs/cs_handlers_test.py @@ -57,7 +57,7 @@ def _WaitUntilOmniSharpServerReady( self, filename ): success = True break request = self._BuildRequest( completer_target = 'filetype_default', - command_arguments = [ 'ServerIsActive' ], + command_arguments = [ 'ServerIsRunning' ], filepath = filename, filetype = 'cs' ) result = self._app.post_json( '/run_completer_command', request ).json