diff --git a/pysoot/jython_wrapper.py b/pysoot/jython_wrapper.py index 09b44d2..65c63f3 100755 --- a/pysoot/jython_wrapper.py +++ b/pysoot/jython_wrapper.py @@ -32,11 +32,13 @@ def __init__(self, jython_folder, module_name, class_name, java_heap_size=None): self.module_name = module_name self.client_stderr = "" self.client_stdout = "" - if java_heap_size is None: + if java_heap_size is not None: + self.java_heap_size = java_heap_size + elif "PYSOOT_HEAP_SIZE" in os.environ: + self.java_heap_size = int(os.environ["PYSOOT_HEAP_SIZE"]) + else: # use 75% of total memory for the Java heap self.java_heap_size = int(psutil.virtual_memory().total*0.75) - else: - self.java_heap_size = java_heap_size self._start_jython() def _start_jython(self):