usergrid git commit: fix typo
Repository: usergrid Updated Branches: refs/heads/9f45130_lock_mgr_fix 021fcba68 -> b85572875 fix typo Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/b8557287 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/b8557287 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/b8557287 Branch: refs/heads/9f45130_lock_mgr_fix Commit: b855728750023e795e4e737d698d1fd94d6b9282 Parents: 021fcba Author: Mike DunkerAuthored: Thu Apr 7 17:03:55 2016 -0700 Committer: Mike Dunker Committed: Thu Apr 7 17:03:55 2016 -0700 -- .../src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/usergrid/blob/b8557287/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java -- diff --git a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java index 6d927b9..ac56c7b 100644 --- a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java +++ b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java @@ -77,7 +77,7 @@ public abstract class OnlyOnceJob implements Job { @Override public void execute( JobExecution execution ) throws Exception { -logger.info("Executing one-time job, LockManager is {}" lockManager == null ? "null" : "not null"); +logger.info("Executing one-time job, LockManager is {}", lockManager == null ? "null" : "not null"); String lockId = execution.getJobId().toString(); Lock lock = lockManager.createLock( emf.getManagementAppId(), String.format( "/jobs/%s", lockId ) );
[1/2] usergrid git commit: Add OnlyOnceJob fix to 9f45130
Repository: usergrid Updated Branches: refs/heads/9f45130_lock_mgr_fix [created] 021fcba68 Add OnlyOnceJob fix to 9f45130 Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/55271ce9 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/55271ce9 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/55271ce9 Branch: refs/heads/9f45130_lock_mgr_fix Commit: 55271ce9347bd4f35224a2c31494b23fa371ae67 Parents: 9f45130 Author: Mike DunkerAuthored: Thu Apr 7 15:33:43 2016 -0700 Committer: Mike Dunker Committed: Thu Apr 7 15:33:43 2016 -0700 -- .../java/org/apache/usergrid/batch/job/OnlyOnceJob.java | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/usergrid/blob/55271ce9/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java -- diff --git a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java index f857d05..afbddc3 100644 --- a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java +++ b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java @@ -19,7 +19,7 @@ package org.apache.usergrid.batch.job; import java.util.concurrent.TimeUnit; -import org.elasticsearch.common.inject.Inject; +import com.google.inject.Injector; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.apache.usergrid.batch.Job; @@ -28,6 +28,8 @@ import org.apache.usergrid.locking.Lock; import org.apache.usergrid.locking.LockManager; import org.apache.usergrid.persistence.EntityManagerFactory; +import javax.annotation.PostConstruct; + /** * Simple abstract job class that performs additional locking to ensure that the job is only executing once. This can be @@ -38,12 +40,14 @@ import org.apache.usergrid.persistence.EntityManagerFactory; @Component("OnlyOnceJob") public abstract class OnlyOnceJob implements Job { -@Inject private LockManager lockManager; @Autowired private EntityManagerFactory emf; +@Autowired +private Injector injector; + /** * @@ -51,6 +55,10 @@ public abstract class OnlyOnceJob implements Job { public OnlyOnceJob() { } +@PostConstruct +public void initLockManager() throws Exception { +this.lockManager = injector.getInstance(LockManager.class); +} /* * (non-Javadoc)
[2/2] usergrid git commit: Added one-time job logging.
Added one-time job logging. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/021fcba6 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/021fcba6 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/021fcba6 Branch: refs/heads/9f45130_lock_mgr_fix Commit: 021fcba68c013414261f3e123d7ec6db8dc938fe Parents: 55271ce Author: Mike DunkerAuthored: Thu Apr 7 16:52:13 2016 -0700 Committer: Mike Dunker Committed: Thu Apr 7 16:52:13 2016 -0700 -- .../java/org/apache/usergrid/batch/job/OnlyOnceJob.java | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/usergrid/blob/021fcba6/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java -- diff --git a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java index afbddc3..6d927b9 100644 --- a/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java +++ b/stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java @@ -27,6 +27,8 @@ import org.apache.usergrid.batch.JobExecution; import org.apache.usergrid.locking.Lock; import org.apache.usergrid.locking.LockManager; import org.apache.usergrid.persistence.EntityManagerFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.annotation.PostConstruct; @@ -40,6 +42,8 @@ import javax.annotation.PostConstruct; @Component("OnlyOnceJob") public abstract class OnlyOnceJob implements Job { +private static final Logger logger = LoggerFactory.getLogger(OnlyOnceJob.class); + private LockManager lockManager; @Autowired @@ -58,6 +62,11 @@ public abstract class OnlyOnceJob implements Job { @PostConstruct public void initLockManager() throws Exception { this.lockManager = injector.getInstance(LockManager.class); +if (lockManager != null) { +logger.info("LockManager injection successful"); +} else { +logger.error("LockManager injection unsuccessful"); +} } /* @@ -68,6 +77,7 @@ public abstract class OnlyOnceJob implements Job { @Override public void execute( JobExecution execution ) throws Exception { +logger.info("Executing one-time job, LockManager is {}" lockManager == null ? "null" : "not null"); String lockId = execution.getJobId().toString(); Lock lock = lockManager.createLock( emf.getManagementAppId(), String.format( "/jobs/%s", lockId ) );