manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1859195 - in /manifoldcf/trunk/framework: agents/src/main/java/org/apache/manifoldcf/agents/system/ api-service/src/main/java/org/apache/manifoldcf/apiservice/ combined-service/src/main/java/org/apache/manifoldcf/combinedservice/ core/src/...
Date Mon, 13 May 2019 17:35:04 GMT
Author: kwright
Date: Mon May 13 17:35:04 2019
New Revision: 1859195

URL: http://svn.apache.org/viewvc?rev=1859195&view=rev
Log:
Use a slightly different way of doing System.exit to insure no deadlocks occur.

Modified:
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/IdleCleanupThread.java
    manifoldcf/trunk/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java
    manifoldcf/trunk/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java
    manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
    manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/AuthCheckThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/MappingThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/AssessmentThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupStufferThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteStufferThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireStufferThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/FinisherThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/HistoryCleanupThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobDeleteThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobStartThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java

Modified: manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/IdleCleanupThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/IdleCleanupThread.java
(original)
+++ manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/IdleCleanupThread.java
Mon May 13 17:35:04 2019
@@ -121,7 +121,7 @@ public class IdleCleanupThread extends T
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -134,7 +134,7 @@ public class IdleCleanupThread extends T
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -148,7 +148,7 @@ public class IdleCleanupThread extends T
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.agents.fatal("IdleCleanupThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
 
   }

Modified: manifoldcf/trunk/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java
(original)
+++ manifoldcf/trunk/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java
Mon May 13 17:35:04 2019
@@ -104,7 +104,7 @@ public class IdleCleanupThread extends T
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -117,7 +117,7 @@ public class IdleCleanupThread extends T
         {
           System.err.println("API service ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -131,7 +131,7 @@ public class IdleCleanupThread extends T
       // Severe error on initialization
       System.err.println("API service could not start - shutting down");
       Logging.root.fatal("IdleCleanupThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
 
   }

Modified: manifoldcf/trunk/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java
(original)
+++ manifoldcf/trunk/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java
Mon May 13 17:35:04 2019
@@ -104,7 +104,7 @@ public class IdleCleanupThread extends T
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -117,7 +117,7 @@ public class IdleCleanupThread extends T
         {
           System.err.println("Combined service ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -131,7 +131,7 @@ public class IdleCleanupThread extends T
       // Severe error on initialization
       System.err.println("Combined service could not start - shutting down");
       Logging.root.fatal("IdleCleanupThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
 
   }

Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
(original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
Mon May 13 17:35:04 2019
@@ -593,6 +593,28 @@ public class ManifoldCF
     return rval.toString();
   }
 
+  /** Shutdown the system using a background thread.
+   */
+  public static void systemExit(int rval) {
+    final Thread t = new SystemExitThread(rval);
+    t.start();
+    // do NOT wait for the thread to finish; doing so results in deadlock on later JVM versions
+  }
+  
+  private static class SystemExitThread extends Thread
+  {
+    private final int rval;
+    
+    public SystemExitThread(final int rval) {
+      this.rval = rval;
+      setDaemon(true);
+    }
+    
+    public void run() {
+      System.exit(rval);
+    }
+  }
+  
   /** Get the mcf version.
   *@return the version string
   */

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java
Mon May 13 17:35:04 2019
@@ -105,7 +105,7 @@ public class IdleCleanupThread extends T
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -118,7 +118,7 @@ public class IdleCleanupThread extends T
         {
           System.err.println("Crawler UI ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -132,7 +132,7 @@ public class IdleCleanupThread extends T
       // Severe error on initialization
       System.err.println("Crawler UI could not start - shutting down");
       Logging.root.fatal("IdleCleanupThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
 
   }

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/AuthCheckThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/AuthCheckThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/AuthCheckThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/AuthCheckThread.java
Mon May 13 17:35:04 2019
@@ -144,7 +144,7 @@ public class AuthCheckThread extends Thr
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -165,7 +165,7 @@ public class AuthCheckThread extends Thr
       // Severe error on initialization
       System.err.println("Authority service auth check thread could not start - shutting
down");
       Logging.authorityService.fatal("AuthCheckThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/IdleCleanupThread.java
Mon May 13 17:35:04 2019
@@ -80,7 +80,7 @@ public class IdleCleanupThread extends T
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -101,7 +101,7 @@ public class IdleCleanupThread extends T
       // Severe error on initialization
       System.err.println("Authority service idle cleanup could not start - shutting down");
       Logging.authorityService.fatal("IdleCleanupThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/MappingThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/MappingThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/MappingThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/system/MappingThread.java
Mon May 13 17:35:04 2019
@@ -134,7 +134,7 @@ public class MappingThread extends Threa
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -155,7 +155,7 @@ public class MappingThread extends Threa
       // Severe error on initialization
       System.err.println("Authority service mapping thread could not start - shutting down");
       Logging.authorityService.fatal("MappingThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/AssessmentThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/AssessmentThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/AssessmentThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/AssessmentThread.java
Mon May 13 17:35:04 2019
@@ -93,7 +93,7 @@ public class AssessmentThread extends Th
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -106,7 +106,7 @@ public class AssessmentThread extends Th
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -120,7 +120,7 @@ public class AssessmentThread extends Th
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("AssessmentThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
 
   }

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupStufferThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupStufferThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupStufferThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupStufferThread.java
Mon May 13 17:35:04 2019
@@ -186,7 +186,7 @@ public class DocumentCleanupStufferThrea
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -199,7 +199,7 @@ public class DocumentCleanupStufferThrea
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -213,7 +213,7 @@ public class DocumentCleanupStufferThrea
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("DocumentCleanupStufferThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
 
   }

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentCleanupThread.java
Mon May 13 17:35:04 2019
@@ -316,7 +316,7 @@ public class DocumentCleanupThread exten
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -330,7 +330,7 @@ public class DocumentCleanupThread exten
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("DocumentCleanupThread "+id+" initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteStufferThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteStufferThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteStufferThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteStufferThread.java
Mon May 13 17:35:04 2019
@@ -184,7 +184,7 @@ public class DocumentDeleteStufferThread
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -197,7 +197,7 @@ public class DocumentDeleteStufferThread
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -211,7 +211,7 @@ public class DocumentDeleteStufferThread
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("DocumentDeleteStufferThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
 
   }

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/DocumentDeleteThread.java
Mon May 13 17:35:04 2019
@@ -227,7 +227,7 @@ public class DocumentDeleteThread extend
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -240,7 +240,7 @@ public class DocumentDeleteThread extend
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -254,7 +254,7 @@ public class DocumentDeleteThread extend
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("DocumentDeleteThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireStufferThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireStufferThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireStufferThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireStufferThread.java
Mon May 13 17:35:04 2019
@@ -201,7 +201,7 @@ public class ExpireStufferThread extends
 
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -214,7 +214,7 @@ public class ExpireStufferThread extends
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -228,7 +228,7 @@ public class ExpireStufferThread extends
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("ExpirationStufferThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ExpireThread.java
Mon May 13 17:35:04 2019
@@ -320,7 +320,7 @@ public class ExpireThread extends Thread
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -334,7 +334,7 @@ public class ExpireThread extends Thread
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("ExpirationThread "+id+" initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/FinisherThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/FinisherThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/FinisherThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/FinisherThread.java
Mon May 13 17:35:04 2019
@@ -94,7 +94,7 @@ public class FinisherThread extends Thre
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -107,7 +107,7 @@ public class FinisherThread extends Thre
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -121,7 +121,7 @@ public class FinisherThread extends Thre
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("FinisherThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/HistoryCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/HistoryCleanupThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/HistoryCleanupThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/HistoryCleanupThread.java
Mon May 13 17:35:04 2019
@@ -103,7 +103,7 @@ public class HistoryCleanupThread extend
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
         }
         catch (InterruptedException e)
@@ -115,7 +115,7 @@ public class HistoryCleanupThread extend
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -129,7 +129,7 @@ public class HistoryCleanupThread extend
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("HistoryCleanupThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java
Mon May 13 17:35:04 2019
@@ -99,7 +99,7 @@ public class IdleCleanupThread extends T
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -112,7 +112,7 @@ public class IdleCleanupThread extends T
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -126,7 +126,7 @@ public class IdleCleanupThread extends T
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("IdleCleanupThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
 
   }

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobDeleteThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobDeleteThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobDeleteThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobDeleteThread.java
Mon May 13 17:35:04 2019
@@ -103,7 +103,7 @@ public class JobDeleteThread extends Thr
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -116,7 +116,7 @@ public class JobDeleteThread extends Thr
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -130,7 +130,7 @@ public class JobDeleteThread extends Thr
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("JobDeleteThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java
Mon May 13 17:35:04 2019
@@ -458,7 +458,7 @@ public class JobNotificationThread exten
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -471,7 +471,7 @@ public class JobNotificationThread exten
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -485,7 +485,7 @@ public class JobNotificationThread exten
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("JobNotificationThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
Mon May 13 17:35:04 2019
@@ -151,7 +151,7 @@ public class JobResetThread extends Thre
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -164,7 +164,7 @@ public class JobResetThread extends Thre
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -178,7 +178,7 @@ public class JobResetThread extends Thre
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("JobResetThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobStartThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobStartThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobStartThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobStartThread.java
Mon May 13 17:35:04 2019
@@ -121,7 +121,7 @@ public class JobStartThread extends Thre
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
         }
         catch (InterruptedException e)
@@ -133,7 +133,7 @@ public class JobStartThread extends Thre
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -147,7 +147,7 @@ public class JobStartThread extends Thre
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("JobStartThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SeedingThread.java
Mon May 13 17:35:04 2019
@@ -284,7 +284,7 @@ public class SeedingThread extends Threa
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -297,7 +297,7 @@ public class SeedingThread extends Threa
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -312,7 +312,7 @@ public class SeedingThread extends Threa
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("SeedingThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/SetPriorityThread.java
Mon May 13 17:35:04 2019
@@ -176,7 +176,7 @@ public class SetPriorityThread extends T
 
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -189,7 +189,7 @@ public class SetPriorityThread extends T
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -203,7 +203,7 @@ public class SetPriorityThread extends T
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("SetPriorityThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartDeleteThread.java
Mon May 13 17:35:04 2019
@@ -183,7 +183,7 @@ public class StartDeleteThread extends T
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -196,7 +196,7 @@ public class StartDeleteThread extends T
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -210,7 +210,7 @@ public class StartDeleteThread extends T
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("StartDeleteThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
Mon May 13 17:35:04 2019
@@ -278,7 +278,7 @@ public class StartupThread extends Threa
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
             // Shut the whole system down!
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -291,7 +291,7 @@ public class StartupThread extends Threa
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -305,7 +305,7 @@ public class StartupThread extends Threa
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("StartupThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StufferThread.java
Mon May 13 17:35:04 2019
@@ -345,7 +345,7 @@ public class StufferThread extends Threa
           {
             System.err.println("agents process ran out of memory - shutting down");
             e.printStackTrace(System.err);
-            System.exit(-200);
+            ManifoldCF.systemExit(-200);
           }
           catch (Throwable e)
           {
@@ -442,7 +442,7 @@ public class StufferThread extends Threa
 
           if (e.getErrorCode() == ManifoldCFException.SETUP_ERROR)
           {
-            System.exit(1);
+            ManifoldCF.systemExit(1);
           }
 
         }
@@ -455,7 +455,7 @@ public class StufferThread extends Threa
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -469,7 +469,7 @@ public class StufferThread extends Threa
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("StufferThread initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
   }
 

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1859195&r1=1859194&r2=1859195&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Mon May 13 17:35:04 2019
@@ -848,7 +848,7 @@ public class WorkerThread extends Thread
         {
           System.err.println("agents process ran out of memory - shutting down");
           e.printStackTrace(System.err);
-          System.exit(-200);
+          ManifoldCF.systemExit(-200);
         }
         catch (Throwable e)
         {
@@ -862,7 +862,7 @@ public class WorkerThread extends Thread
       // Severe error on initialization
       System.err.println("agents process could not start - shutting down");
       Logging.threads.fatal("WorkerThread "+id+" initialization error tossed: "+e.getMessage(),e);
-      System.exit(-300);
+      ManifoldCF.systemExit(-300);
     }
 
   }



Mime
View raw message