AJ-211 - Catching exception when executing a runnable with the configured thread pool executor fails

srt · srt · commit e9eccba83ca5 · 2009-07-21T20:14:52.000Z
diff --git a/src/main/java/org/asteriskjava/fastagi/AbstractAgiServer.java b/src/main/java/org/asteriskjava/fastagi/AbstractAgiServer.java
@@ -119,14 +119,32 @@ protected void finalize() throws Throwable
         }
     }
 
+    /**
+     * Execute the runnable using the configured ThreadPoolExecutor obtained from {@link #getPool()}.
+     *
+     * @param command the command to run.
+     */
     protected void execute(Runnable command)
     {
         if (isDie())
         {
             logger.warn("AgiServer is shutting down: Refused to execute AgiScript");
             return;
         }
-        getPool().execute(command);
+
+        try
+        {
+            getPool().execute(command);
+        }
+        catch (Exception e)
+        {
+            handleException("Unable to execute " + command.getClass().getName(), e);
+        }
+    }
+
+    protected void handleException(String message, Exception e)
+    {
+        logger.warn(message, e);
     }
 
     private synchronized ThreadPoolExecutor getPool()
diff --git a/src/main/java/org/asteriskjava/fastagi/DefaultAgiServer.java b/src/main/java/org/asteriskjava/fastagi/DefaultAgiServer.java
@@ -267,8 +267,8 @@ public void startup() throws IOException, IllegalStateException
                 }
                 else
                 {
-                    logger.error("IOException while waiting for connections.", e);
-                    // log error but continue
+                    handleException("IOException while waiting for connections.", e);
+                    // handle exception but continue to run
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -119,14 +119,32 @@ protected void finalize() throws Throwable`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
	`122`	`+ /**`
	`123`	`+ * Execute the runnable using the configured ThreadPoolExecutor obtained from {@link #getPool()}.`
	`124`	`+ *`
	`125`	`+ * @param command the command to run.`
	`126`	`+ */`
`122`	`127`	`protected void execute(Runnable command)`
`123`	`128`	`{`
`124`	`129`	`if (isDie())`
`125`	`130`	`{`
`126`	`131`	`logger.warn("AgiServer is shutting down: Refused to execute AgiScript");`
`127`	`132`	`return;`
`128`	`133`	`}`
`129`		`- getPool().execute(command);`
	`134`	`+`
	`135`	`+ try`
	`136`	`+ {`
	`137`	`+ getPool().execute(command);`
	`138`	`+ }`
	`139`	`+ catch (Exception e)`
	`140`	`+ {`
	`141`	`+ handleException("Unable to execute " + command.getClass().getName(), e);`
	`142`	`+ }`
	`143`	`+ }`
	`144`	`+`
	`145`	`+ protected void handleException(String message, Exception e)`
	`146`	`+ {`
	`147`	`+ logger.warn(message, e);`
`130`	`148`	`}`
`131`	`149`
`132`	`150`	`private synchronized ThreadPoolExecutor getPool()`
Original file line number	Diff line number	Diff line change
`@@ -267,8 +267,8 @@ public void startup() throws IOException, IllegalStateException`
`267`	`267`	`}`
`268`	`268`	`else`
`269`	`269`	`{`
`270`		`- logger.error("IOException while waiting for connections.", e);`
`271`		`- // log error but continue`
	`270`	`+ handleException("IOException while waiting for connections.", e);`
	`271`	`+ // handle exception but continue to run`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`	`}`