updated application to stop when job completes
Project: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/commit/83fa16c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/tree/83fa16c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/diff/83fa16c5 Branch: refs/heads/master Commit: 83fa16c58e78f14c81cadb7e90eef818ddf13c8b Parents: 0ba0dd4 Author: Frank Greguska <[email protected]> Authored: Thu Jan 18 13:51:44 2018 -0800 Committer: Frank Greguska <[email protected]> Committed: Thu Jan 18 13:51:44 2018 -0800 ---------------------------------------------------------------------- .../java/gov/nasa/jpl/nexus/ningester/NingesterApplication.java | 5 ++++- .../gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java | 4 +++- src/testJobs/resources/testjobs/AvhrrJobTest.yml | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/83fa16c5/src/main/java/gov/nasa/jpl/nexus/ningester/NingesterApplication.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/NingesterApplication.java b/src/main/java/gov/nasa/jpl/nexus/ningester/NingesterApplication.java index e4133dd..09ee307 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/NingesterApplication.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/NingesterApplication.java @@ -2,11 +2,14 @@ package gov.nasa.jpl.nexus.ningester; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; @SpringBootApplication public class NingesterApplication { public static void main(String[] args) { - SpringApplication.run(NingesterApplication.class, args); + + ApplicationContext context = SpringApplication.run(NingesterApplication.class, args); + SpringApplication.exit(context); } } http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/83fa16c5/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java ---------------------------------------------------------------------- diff --git a/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java b/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java index 8a5504e..dc01195 100644 --- a/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java +++ b/src/main/java/gov/nasa/jpl/nexus/ningester/configuration/BatchConfig.java @@ -31,6 +31,8 @@ import org.springframework.core.io.ResourceLoader; @Import(AppConfig.class) public class BatchConfig { + public static final String NINGESTER_JOB_NAME = "ningester"; + @Autowired protected JobBuilderFactory jobs; @@ -45,7 +47,7 @@ public class BatchConfig { @Bean public Job job(@Qualifier("ingestGranule") Step step1) { - return jobs.get("Ningester").start(step1).build(); + return jobs.get(NINGESTER_JOB_NAME).start(step1).build(); } @Bean http://git-wip-us.apache.org/repos/asf/incubator-sdap-ningester/blob/83fa16c5/src/testJobs/resources/testjobs/AvhrrJobTest.yml ---------------------------------------------------------------------- diff --git a/src/testJobs/resources/testjobs/AvhrrJobTest.yml b/src/testJobs/resources/testjobs/AvhrrJobTest.yml index a6b7e4e..5f6fea0 100644 --- a/src/testJobs/resources/testjobs/AvhrrJobTest.yml +++ b/src/testJobs/resources/testjobs/AvhrrJobTest.yml @@ -45,7 +45,9 @@ ningester: --- # Connection settings for the test profile spring: - profiles: test + profiles: + - test + - local data: cassandra: keyspaceName: nexustiles
