michele.artini
/
dnet-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remved process callback

This commit is contained in:
Michele Artini 2024-01-18 10:13:26 +01:00
parent 58c8944598
commit 34b0cf27b6
3 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/ProcessEngine.java
View File

@ -40,7 +40,6 @@ import eu.dnetlib.wfs.repository.WfHistoryJobRepository;
import eu.dnetlib.wfs.repository.WfRunningJobRepository;
import eu.dnetlib.wfs.utils.EmailSender;
import eu.dnetlib.wfs.utils.GraphUtils;
import eu.dnetlib.wfs.utils.ProcessCallback;
import jakarta.annotation.PostConstruct;
import jakarta.transaction.Transactional;
@ -159,21 +158,19 @@ public class ProcessEngine {
final Optional<WfRunningJob> job = this.jobRepository.findById(processId);
if (job.isPresent() && (job.get().getStatus() == JobStatus.accepted) && job.get().getWfExecutor().equals(executor)) {
startWorkflowJob(job.get(), null);
startWorkflowJob(job.get());
}
}
@Transactional
public void startWorkflowJob(final WfRunningJob job, final ProcessCallback callback) {
public void startWorkflowJob(final WfRunningJob job) {
final WorkflowProcess process = new WorkflowProcess(job);
try {
GraphUtils.checkValidity(job.getGraph(), this.validNodeTypes);
process.setCallback(callback);
this.processRegistry.registerProcess(process);
job.setStatus(JobStatus.running);

19
dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/procs/WorkflowProcess.java
View File

@ -10,7 +10,6 @@ import org.apache.commons.lang3.math.NumberUtils;
import eu.dnetlib.domain.wfs.jobs.JobStatus;
import eu.dnetlib.domain.wfs.jobs.WfRunningJob;
import eu.dnetlib.wfs.utils.ProcessCallback;
/**
* Created by michele on 19/11/15.
@ -25,8 +24,6 @@ public class WorkflowProcess implements Comparable<WorkflowProcess> {
private final String id;
private final WfRunningJob jobDetails;
private ProcessCallback callback;
private List<RuntimeEnv> envs = new CopyOnWriteArrayList<>();
private final Map<String, List<RuntimeEnv>> pausedJoinNodeEnvs = new HashMap<>();
@ -110,22 +107,6 @@ public class WorkflowProcess implements Comparable<WorkflowProcess> {
setError(err);
}
if (this.callback != null) {
if (err != null) {
this.callback.onFail(this, err);
} else {
this.callback.onSuccess(this);
}
}
}
public ProcessCallback getCallback() {
return this.callback;
}
public void setCallback(final ProcessCallback callback) {
this.callback = callback;
}
public void setEnvs(final List<RuntimeEnv> envs) {

8
dnet-app/libs/dnet-wf-executor-common/src/main/java/eu/dnetlib/wfs/utils/ProcessCallback.java
View File

@ -1,8 +0,0 @@
package eu.dnetlib.wfs.utils;
import eu.dnetlib.utils.DnetCallback;
import eu.dnetlib.wfs.procs.WorkflowProcess;
public interface ProcessCallback extends DnetCallback<WorkflowProcess> {
}