better lock management and better ci
This commit is contained in:
parent
a5a77ad833
commit
0b0706ab18
2 changed files with 7 additions and 4 deletions
|
|
@ -2,8 +2,5 @@ image: java:8-jdk
|
||||||
before_script:
|
before_script:
|
||||||
- export GRADLE_USER_HOME=`pwd`/.gradle
|
- export GRADLE_USER_HOME=`pwd`/.gradle
|
||||||
|
|
||||||
build:
|
|
||||||
script: "./gradlew clean build"
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
script: "./gradlew test"
|
script: "./buildwrapper.sh"
|
||||||
|
|
|
||||||
|
|
@ -221,12 +221,18 @@ class ProcessManager {
|
||||||
JobServServer.logger.write("[!] Couldnt get lock " +
|
JobServServer.logger.write("[!] Couldnt get lock " +
|
||||||
String.valueOf(pid) + ": "+ e.getMessage());
|
String.valueOf(pid) + ": "+ e.getMessage());
|
||||||
future.cancel(true);
|
future.cancel(true);
|
||||||
|
|
||||||
|
// in case lock was grabbed after exception
|
||||||
|
this.releaseLock(pid);
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
} catch (ExecutionException e) {
|
} catch (ExecutionException e) {
|
||||||
JobServServer.logger.write("[!] Couldnt get lock " +
|
JobServServer.logger.write("[!] Couldnt get lock " +
|
||||||
String.valueOf(pid) + ": "+ e.getMessage());
|
String.valueOf(pid) + ": "+ e.getMessage());
|
||||||
future.cancel(true);
|
future.cancel(true);
|
||||||
|
|
||||||
|
// in case lock was grabbed after exception
|
||||||
|
this.releaseLock(pid);
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// cancel the attempt to grab the lock
|
// cancel the attempt to grab the lock
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue