Skip to content

Commit f49bc60

Browse files
committed
Added missing QueueDAO to test context. Added comment and improved logging in resumeDeposit method
1 parent 385dc2c commit f49bc60

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

deposit/src/main/java/edu/unc/lib/deposit/work/DepositSupervisor.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -664,16 +664,18 @@ private void resumeDeposit(String uuid, Map<String, String> status, long delay)
664664
jobStatusFactory.clearStale(uuid);
665665
depositStatusFactory.deleteField(uuid, DepositField.errorMessage);
666666

667+
// since we already checked for queued jobs at startup, only check when resuming from a paused state
667668
boolean enqueueNext = true;
668669
if (DepositState.paused.name().equals(status.get(DepositField.state.name()))) {
669670
Map<String, Set<String>> depositSet = getQueuedDepositsWithJobs();
670671
enqueueNext = !depositSet.containsKey(uuid);
671-
LOG.info("Resuming from paused state. {} will enqueue a new job {}", uuid, enqueueNext);
672672
}
673673

674674
if (enqueueNext) {
675675
List<String> successfulJobs = jobStatusFactory.getSuccessfulJobNames(uuid);
676676
queueNextJob(null, uuid, status, successfulJobs, delay);
677+
} else {
678+
LOG.info("Resuming {} from paused state. A job is already queued so no new jobs will be enqueued", uuid);
677679
}
678680

679681
depositStatusFactory.setState(uuid, DepositState.queued);

deposit/src/test/resources/service-context.xml

+5
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@
7373
<constructor-arg ref="jedisPool" />
7474
</bean>
7575

76+
<bean id="queueDAO" class="net.greghaines.jesque.meta.dao.impl.QueueInfoDAORedisImpl">
77+
<constructor-arg ref="jesqueConfig" />
78+
<constructor-arg ref="jedisPool" />
79+
</bean>
80+
7681
<bean id="dataSet" class="com.hp.hpl.jena.tdb.TDBFactory" factory-method="createDataset" destroy-method="close">
7782
<constructor-arg value="#{depositsDirectory+'/jena-tdb-dataset'}"/>
7883
</bean>

0 commit comments

Comments
 (0)