Restart feeders onError

jimkont · jimkont · commit 9383277ef99c · 2013-07-24T17:11:58.000+03:00
diff --git a/live/src/main/java/org/dbpedia/extraction/live/feeder/Feeder.java b/live/src/main/java/org/dbpedia/extraction/live/feeder/Feeder.java
@@ -44,11 +44,14 @@ public LiveQueuePriority getQueuePriority(){
         return queuePriority;
     }
 
+    protected abstract void initFeeder();
+
     /*
     * Starts the feeder (it can only start once
     * */
     public void startFeeder() {
         if (keepRunning == true) {
+            initFeeder();
             start();
         }
     }
@@ -104,6 +107,8 @@ public void run() {
                 }
             } catch (Exception exp) {
                 logger.error(ExceptionUtil.toString(exp));
+                // On error re-initiate feeder
+                initFeeder();
             }
         }
     }
diff --git a/live/src/main/java/org/dbpedia/extraction/live/feeder/OAIFeeder.java b/live/src/main/java/org/dbpedia/extraction/live/feeder/OAIFeeder.java
@@ -47,12 +47,14 @@ public OAIFeeder(String feederName, LiveQueuePriority queuePriority,
 
         this.pollInterval = pollInterval;
         this.sleepInterval = sleepInterval;
+    }
 
 
+    @Override
+    protected void initFeeder() {
         oaiRecordIterator = OAIUtil.createEndlessFeederItemIterator(oaiUri, latestProcessDate, pollInterval, sleepInterval);
     }
 
-
     @Override
     protected List<LiveQueueItem> getNextItems() {
         List<LiveQueueItem> i = new ArrayList<LiveQueueItem>();
diff --git a/live/src/main/java/org/dbpedia/extraction/live/feeder/UnmodifiedFeeder.java b/live/src/main/java/org/dbpedia/extraction/live/feeder/UnmodifiedFeeder.java
@@ -35,6 +35,11 @@ public UnmodifiedFeeder(String feederName, LiveQueuePriority queuePriority,
         this.sleepTime = sleepTime;
     }
 
+    @Override
+    protected void initFeeder() {
+        //Nothing to init here
+    }
+
     @Override
     public void startFeeder() {
         // Sleep to allow other feeders fill the queue

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,14 @@ public LiveQueuePriority getQueuePriority(){`
`44`	`44`	`return queuePriority;`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ protected abstract void initFeeder();`
	`48`	`+`
`47`	`49`	`/*`
`48`	`50`	`* Starts the feeder (it can only start once`
`49`	`51`	`* */`
`50`	`52`	`public void startFeeder() {`
`51`	`53`	`if (keepRunning == true) {`
	`54`	`+ initFeeder();`
`52`	`55`	`start();`
`53`	`56`	`}`
`54`	`57`	`}`
`@@ -104,6 +107,8 @@ public void run() {`
`104`	`107`	`}`
`105`	`108`	`} catch (Exception exp) {`
`106`	`109`	`logger.error(ExceptionUtil.toString(exp));`
	`110`	`+ // On error re-initiate feeder`
	`111`	`+ initFeeder();`
`107`	`112`	`}`
`108`	`113`	`}`
`109`	`114`	`}`