Ver código fonte

add running flag to TerminationRequestResult

tags/2.0.1
Jonathan Cobb 4 anos atrás
pai
commit
b08f3dbd0b
2 arquivos alterados com 16 adições e 3 exclusões
  1. +14
    -1
      src/main/java/org/cobbzilla/util/daemon/TerminationRequestResult.java
  2. +2
    -2
      src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java

+ 14
- 1
src/main/java/org/cobbzilla/util/daemon/TerminationRequestResult.java Ver arquivo

@@ -1,7 +1,20 @@
package org.cobbzilla.util.daemon;

import com.fasterxml.jackson.annotation.JsonCreator;
import lombok.AllArgsConstructor;
import lombok.Getter;

@AllArgsConstructor
public enum TerminationRequestResult {

alive, dead, interrupted, terminated;
alive (true),
dead (false),
interrupted_alive (true),
interrupted_dead (false),
terminated (false);

@Getter private final boolean running;

@JsonCreator public static TerminationRequestResult fromString (String val) { return valueOf(val.toLowerCase()); }

}

+ 2
- 2
src/main/java/org/cobbzilla/util/daemon/ZillaRuntime.java Ver arquivo

@@ -92,11 +92,11 @@ public class ZillaRuntime {
return TerminationRequestResult.terminated;
} else {
if (log.isWarnEnabled()) log.warn("terminate: thread did not respond to interrupt, but onlyIf function returned false, not killing: " + thread + (verbose ? " with stack " + stacktrace(thread) + "\nfrom: " + stacktrace() : ""));
return TerminationRequestResult.interrupted;
return TerminationRequestResult.interrupted_alive;
}
} else {
if (log.isWarnEnabled()) log.warn("terminate: thread exited after interrupt: "+thread);
return TerminationRequestResult.interrupted;
return TerminationRequestResult.interrupted_dead;
}
}



Carregando…
Cancelar
Salvar