Merge pull request #256 from igormp/kill-server

Add killServer() function

Author: chrismattmann

README.md

@@ -47,6 +47,7 @@ These are read once, when tika/tika.py is initially loaded and used throughout a
 10. `TIKA_STARTUP_SLEEP` - number of seconds (`float`) to wait per check if Tika server is launched at runtime
 11. `TIKA_STARTUP_MAX_RETRY` - number of checks (`int`) to attempt for Tika server startup if launched at runtime
 12. `TIKA_JAVA_ARGS` - set java runtime arguments, e.g, `-Xmx4g`
+
 Testing it out
 ==============
 

tika/tests/test_tika.py

@@ -19,6 +19,7 @@
 import os
 import unittest
 import tika.parser
+import tika.tika
 
 
 class CreateTest(unittest.TestCase):
@@ -54,6 +55,12 @@ def test_local_path(self):
         file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
         self.assertTrue(tika.parser.from_file(file))
 
+    def test_kill_server(self):
+        """parse some file then kills server"""
+        file = os.path.join(os.path.dirname(__file__), 'files', 'rwservlet.pdf')
+        with open(file, 'rb') as file_obj:
+            tika.parser.from_file(file_obj)
+        self.assertIsNone(tika.tika.killServer())
 
 if __name__ == '__main__':
     unittest.main()

tika/tika.py

@@ -140,6 +140,7 @@ def make_content_disposition_header(fn):
 from subprocess import Popen
 from subprocess import STDOUT
 from os import walk
+import signal
 import logging
 import io
 
@@ -188,6 +189,9 @@ def make_content_disposition_header(fn):
 EncodeUtf8 = 0
 csvOutput = 0
 
+# will be used later on to kill the process and free up ram
+TikaServerProcess = False
+
 class TikaException(Exception):
     pass
 
@@ -660,7 +664,8 @@ def startServer(tikaServerJar, java_path = TikaJava, java_args = TikaJavaArgs, s
         return False
 
     # Run java with jar args
-    cmd = Popen(cmd_string, stdout=logFile, stderr=STDOUT, shell=True)
+    global TikaServerProcess
+    TikaServerProcess = Popen(cmd_string, stdout=logFile, stderr=STDOUT, shell=True, preexec_fn=os.setsid)
 
     # Check logs and retry as configured
     try_count = 0
@@ -681,6 +686,16 @@ def startServer(tikaServerJar, java_path = TikaJava, java_args = TikaJavaArgs, s
     else:
         return True
 
+def killServer():
+    '''
+    Kills the tika server started by the current execution instance
+    '''
+    if(TikaServerProcess):
+        os.killpg(os.getpgid(TikaServerProcess.pid), signal.SIGTERM)
+        time.sleep(1)
+    else:
+        log.error("Server not running, or was already running before")
+
 def toFilename(url):
     '''
     gets url and returns filename