From 0b0706ab1806ef8c6035a60018beb4b3930f89d5 Mon Sep 17 00:00:00 2001 From: Aidan Hahn Date: Fri, 31 May 2019 14:11:50 -0700 Subject: [PATCH] better lock management and better ci --- .gitlab-ci.yml | 5 +---- src/main/java/JobServ/ProcessManager.java | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 853c441..6794290 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,5 @@ image: java:8-jdk before_script: - export GRADLE_USER_HOME=`pwd`/.gradle -build: - script: "./gradlew clean build" - test: - script: "./gradlew test" + script: "./buildwrapper.sh" diff --git a/src/main/java/JobServ/ProcessManager.java b/src/main/java/JobServ/ProcessManager.java index 736fd21..d659920 100644 --- a/src/main/java/JobServ/ProcessManager.java +++ b/src/main/java/JobServ/ProcessManager.java @@ -221,12 +221,18 @@ class ProcessManager { JobServServer.logger.write("[!] Couldnt get lock " + String.valueOf(pid) + ": "+ e.getMessage()); future.cancel(true); + + // in case lock was grabbed after exception + this.releaseLock(pid); return false; } catch (ExecutionException e) { JobServServer.logger.write("[!] Couldnt get lock " + String.valueOf(pid) + ": "+ e.getMessage()); future.cancel(true); + + // in case lock was grabbed after exception + this.releaseLock(pid); return false; // cancel the attempt to grab the lock