honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve logging

This commit is contained in:
Ken Stevens 2019-12-03 22:02:00 -05:00
parent 09d2599ce5
commit b171ff97ea
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/sched/BaseHapiScheduler.java
View File

@ -6,6 +6,7 @@ import ca.uhn.fhir.jpa.model.sched.ScheduledJobDefinition;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.Validate;
import org.jetbrains.annotations.NotNull;
import org.quartz.*; import org.quartz.*;
import org.quartz.impl.JobDetailImpl; import org.quartz.impl.JobDetailImpl;
import org.quartz.impl.StdSchedulerFactory; import org.quartz.impl.StdSchedulerFactory;
@ -31,6 +32,7 @@ public abstract class BaseHapiScheduler implements IHapiScheduler {
private final Properties myProperties = new Properties(); private final Properties myProperties = new Properties();
private Scheduler myScheduler; private Scheduler myScheduler;
private String myInstanceName;
public BaseHapiScheduler(String theThreadNamePrefix, AutowiringSpringBeanJobFactory theSpringBeanJobFactory) { public BaseHapiScheduler(String theThreadNamePrefix, AutowiringSpringBeanJobFactory theSpringBeanJobFactory) {
myThreadNamePrefix = theThreadNamePrefix; myThreadNamePrefix = theThreadNamePrefix;
@ -38,8 +40,8 @@ public abstract class BaseHapiScheduler implements IHapiScheduler {
} }
void setInstanceName(String theName) { void setInstanceName(String theInstanceName) {
myProperties.setProperty(PROP_SCHED_INSTANCE_NAME, theName + "-" + nextSchedulerId()); myInstanceName = theInstanceName;
} }
@ -58,7 +60,13 @@ public abstract class BaseHapiScheduler implements IHapiScheduler {
protected void setProperties() { protected void setProperties() {
addProperty("org.quartz.threadPool.threadCount", "4"); addProperty("org.quartz.threadPool.threadCount", "4");
addProperty("org.quartz.threadPool.threadNamePrefix", myThreadNamePrefix + "-" + myProperties.get(PROP_SCHED_INSTANCE_NAME)); myProperties.setProperty(PROP_SCHED_INSTANCE_NAME, myInstanceName + "-" + nextSchedulerId());
addProperty("org.quartz.threadPool.threadNamePrefix", getThreadPrefix());
}
@NotNull
private String getThreadPrefix() {
return myThreadNamePrefix + "-" + myInstanceName;
} }
protected void addProperty(String key, String value) { protected void addProperty(String key, String value) {
@ -68,6 +76,7 @@ public abstract class BaseHapiScheduler implements IHapiScheduler {
@Override @Override
public void start() { public void start() {
try { try {
ourLog.info("Starting scheduler {}", getThreadPrefix());
myScheduler.start(); myScheduler.start();
} catch (SchedulerException e) { } catch (SchedulerException e) {
ourLog.error("Failed to start up scheduler", e); ourLog.error("Failed to start up scheduler", e);