Auto merge of #888 - micbou:update-jedihttp, r=puremourning

[READY] Update JediHTTP Make JediHTTP shut itself down after 30 minutes of inactivity. Fixes ycm-core/YouCompleteMe#2852.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/ycmd/888)
ycm-core · Dec 21, 2017 · e07d436 · e07d436
2 parents f58c1f7 + babf195
commit e07d436
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/third_party/JediHTTP b/third_party/JediHTTP
diff --git a/ycmd/completers/python/jedi_completer.py b/ycmd/completers/python/jedi_completer.py
@@ -42,12 +42,13 @@
 
 HMAC_SECRET_LENGTH = 16
 JEDIHTTP_HMAC_HEADER = 'x-jedihttp-hmac'
+JEDIHTTP_IDLE_SUICIDE_SECONDS = 1800  # 30 minutes
 BINARY_NOT_FOUND_MESSAGE = ( 'The specified python interpreter {0} ' +
                              'was not found. Did you specify it correctly?' )
 LOGFILE_FORMAT = 'jedihttp_{port}_{std}_'
 PATH_TO_JEDIHTTP = os.path.abspath(
   os.path.join( os.path.dirname( __file__ ), '..', '..', '..',
-                'third_party', 'JediHTTP', 'jedihttp.py' ) )
+                'third_party', 'JediHTTP', 'jedihttp' ) )
 
 
 class JediCompleter( Completer ):
@@ -167,11 +168,13 @@ def _StartServer( self ):
         json.dump( { 'hmac_secret': ToUnicode(
                         b64encode( self._hmac_secret ) ) },
                    hmac_file )
-        command = [ self._python_binary_path,
-                    PATH_TO_JEDIHTTP,
-                    '--port', str( self._jedihttp_port ),
-                    '--log', self._GetLoggingLevel(),
-                    '--hmac-file-secret', hmac_file.name ]
+        command = [
+          self._python_binary_path,
+          PATH_TO_JEDIHTTP,
+          '--port', str( self._jedihttp_port ),
+          '--log', self._GetLoggingLevel(),
+          '--hmac-file-secret', hmac_file.name,
+          '--idle-suicide-seconds', str( JEDIHTTP_IDLE_SUICIDE_SECONDS ) ]
 
       self._logfile_stdout = utils.CreateLogfile(
           LOGFILE_FORMAT.format( port = self._jedihttp_port, std = 'stdout' ) )
+13 −0		.coveragerc
+2 −0		.gitignore
+3 −2		.travis.yml
+13 −0		README.md
+6 −1		appveyor.yml
+18 −0		codecov.yml
+13 −2		jedihttp/__main__.py
+35 −20		jedihttp/tests/end_to_end_test.py
+85 −0		jedihttp/watchdog_plugin.py
+4 −0		test_requirements.txt
+9 −1		tox.ini
+18 −13		travis/install.sh
+0 −19		travis/run.sh
+1 −1		vendor/jedi
+1 −1		vendor/parso
+1 −1		vendor/waitress