You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/04/29 03:37:03 UTC

[10/11] git commit: Fixed issues with logging

Fixed issues with logging


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/ac1e37d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/ac1e37d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/ac1e37d3

Branch: refs/heads/master
Commit: ac1e37d3ba8d061932dfdf6f0545fd7039485657
Parents: 9778a28
Author: mfranklin <mf...@apache.org>
Authored: Mon Apr 28 21:33:29 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Mon Apr 28 21:33:29 2014 -0400

----------------------------------------------------------------------
 .../org/apache/streams/sysomos/SysomosHeartbeatStream.java   | 5 ++++-
 .../java/org/apache/streams/sysomos/SysomosProvider.java     | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ac1e37d3/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosHeartbeatStream.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosHeartbeatStream.java b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosHeartbeatStream.java
index ff9bc86..e552ecd 100644
--- a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosHeartbeatStream.java
+++ b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosHeartbeatStream.java
@@ -53,13 +53,14 @@ public class SysomosHeartbeatStream implements Runnable {
         QueryResult result;
         //Iff we are trying to get to a specific document ID, continue to query after minimum delay
         do {
+            LOGGER.debug("Querying API to match last ID of {}", lastID);
             result = executeAPIRequest();
-            LOGGER.debug("Querying API to match last ID of {}");
             sleep();
         } while (lastID != null && !result.isMatchedLastId());
         //Set the last ID so that the next time we are executed we will continue to query only so long as we haven't
         //found the specific ID
         lastID = result.getCurrentId();
+        LOGGER.debug("Completed current execution with a final docID of {}", lastID);
     }
 
     protected void sleep() {
@@ -76,6 +77,8 @@ public class SysomosHeartbeatStream implements Runnable {
                 .setOffset(0)
                 .setReturnSetSize(maxApiBatch).execute();
 
+        LOGGER.debug("Received {} results from API query", response.getCount());
+
         String currentId = null;
         boolean matched = false;
         for(BeatApi.BeatResponse.Beat beat : response.getBeat()) {

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ac1e37d3/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosProvider.java b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosProvider.java
index d61c43f..9f12cc7 100644
--- a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosProvider.java
+++ b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/SysomosProvider.java
@@ -40,7 +40,10 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  */
 public class SysomosProvider implements StreamsProvider {
 
+    public final static String STREAMS_ID = "SysomosProvider";
+
     private final static Logger LOGGER = LoggerFactory.getLogger(SysomosProvider.class);
+
     public static final int LATENCY = 10000;  //Default minLatency for querying the Sysomos API in milliseconds
     public static final long PROVIDER_BATCH_SIZE = 10000L; //Default maximum size of the queue
     public static final long API_BATCH_SIZE = 1000L; //Default maximum size of an API request
@@ -95,6 +98,7 @@ public class SysomosProvider implements StreamsProvider {
         StreamsResultSet current;
         try {
             lock.writeLock().lock();
+            LOGGER.debug("Creating new result set for {} items", providerQueue.size());
             current = new StreamsResultSet(providerQueue);
             providerQueue = constructQueue();
         } finally {
@@ -116,7 +120,7 @@ public class SysomosProvider implements StreamsProvider {
 
     @Override
     public void prepare(Object configurationObject) {
-        //NOP
+        this.providerQueue = constructQueue();
     }
 
     @Override
@@ -171,8 +175,10 @@ public class SysomosProvider implements StreamsProvider {
      */
     private void pauseForSpace() {
         while(this.providerQueue.size() >= maxQueued) {
+            LOGGER.trace("Sleeping the current thread due to a full queue");
             try {
                 Thread.sleep(100);
+                LOGGER.trace("Resuming thread after wait period");
             } catch (InterruptedException e) {
                 LOGGER.warn("Thread was interrupted", e);
             }