diff --git a/.gitignore b/.gitignore index 8322a22c45ee808a8977728bf23eb989233aab79..927af7a9b8fc66371d1b1c0acb07b98f3861774f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ ENV/ env.bak/ venv.bak/ .idea -config_phaeoexplorer* \ No newline at end of file +config_phaeoexplorer* +*.pyc diff --git a/utilities.py b/utilities.py index fecd391117b6cb21c3ae67fe80fd5f0e5f37bb4f..eef544818f73ad9ff58e00baecbef481e6a01a1f 100644 --- a/utilities.py +++ b/utilities.py @@ -94,7 +94,7 @@ def check_galaxy_state(genus_lowercase, species, script_dir): # Run supervisorctl status in the galaxy container via serexec galaxy_logs = subprocess.run(["%s/serexec" % script_dir, "{0}_{1}_galaxy".format(genus_lowercase, species), - "supervisorctl", "status", "galaxy:"], capture_output=True) + "supervisorctl", "status", "galaxy:"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) if "galaxy:galaxy_web RUNNING" in str(galaxy_logs.stdout) \ and "galaxy:handler0 RUNNING" in str(galaxy_logs.stdout) \ and "galaxy:handler1 RUNNING" in str(galaxy_logs.stdout):