manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1640772 - in /manifoldcf/trunk: CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Date Thu, 20 Nov 2014 17:41:45 GMT
Author: kwright
Date: Thu Nov 20 17:41:45 2014
New Revision: 1640772

URL: http://svn.apache.org/r1640772
Log:
Fix for CONNECTORS-1108.  Committed on behalf of Aeham Abushwashi.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1640772&r1=1640771&r2=1640772&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Nov 20 17:41:45 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.0-dev =====================
 
+CONNECTORS-1108: Turn most jobs logging messages from DEBUG
+to INFO.
+(Aeham Abushwashi)
+
 CONNECTORS-1100: Change how reprioritization is done to improve
 overall usability at large scale.
 (Aeham Abushwashi, Karl Wright)

Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1640772&r1=1640771&r2=1640772&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
Thu Nov 20 17:41:45 2014
@@ -759,8 +759,7 @@ public class JobManager implements IJobM
       if (status != jobs.STATUS_INACTIVE)
         throw new ManifoldCFException("Job "+id+" is busy; you must wait and/or shut it down
before deleting it");
       jobs.writePermanentStatus(id,jobs.STATUS_READYFORDELETE,true);
-      if (Logging.jobs.isDebugEnabled())
-        Logging.jobs.debug("Job "+id+" marked for deletion");
+      Logging.jobs.info("Job "+id+" marked for deletion");
     }
     catch (ManifoldCFException e)
     {
@@ -885,7 +884,7 @@ public class JobManager implements IJobM
   public void cleanupProcessData(String processID)
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Cleaning up process data for process '"+processID+"'");
+    Logging.jobs.info("Cleaning up process data for process '"+processID+"'");
     while (true)
     {
       long sleepAmt = 0L;
@@ -905,7 +904,7 @@ public class JobManager implements IJobM
         TrackerClass.notePrecommit();
         database.performCommit();
         TrackerClass.noteCommit();
-        Logging.jobs.debug("Cleanup complete");
+        Logging.jobs.info("Cleanup complete");
         break;
       }
       catch (ManifoldCFException e)
@@ -949,7 +948,7 @@ public class JobManager implements IJobM
   public void cleanupProcessData()
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Cleaning up all process data");
+    Logging.jobs.info("Cleaning up all process data");
     while (true)
     {
       long sleepAmt = 0L;
@@ -969,7 +968,7 @@ public class JobManager implements IJobM
         TrackerClass.notePrecommit();
         database.performCommit();
         TrackerClass.noteCommit();
-        Logging.jobs.debug("Cleanup complete");
+        Logging.jobs.info("Cleanup complete");
         break;
       }
       catch (ManifoldCFException e)
@@ -1008,7 +1007,7 @@ public class JobManager implements IJobM
   public void prepareForClusterStart()
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Starting cluster");
+    Logging.jobs.info("Starting cluster");
     while (true)
     {
       long sleepAmt = 0L;
@@ -1028,7 +1027,7 @@ public class JobManager implements IJobM
         TrackerClass.notePrecommit();
         database.performCommit();
         TrackerClass.noteCommit();
-        Logging.jobs.debug("Cluster start complete");
+        Logging.jobs.info("Cluster start complete");
         break;
       }
       catch (ManifoldCFException e)
@@ -1065,7 +1064,7 @@ public class JobManager implements IJobM
   public void resetDocumentWorkerStatus(String processID)
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Resetting document active status");
+    Logging.jobs.info("Resetting document active status");
     while (true)
     {
       long sleepAmt = 0L;
@@ -1103,7 +1102,7 @@ public class JobManager implements IJobM
         sleepFor(sleepAmt);
       }
     }
-    Logging.jobs.debug("Reset complete");
+    Logging.jobs.info("Reset complete");
   }
 
   /** Reset as part of restoring seeding threads.
@@ -1113,7 +1112,7 @@ public class JobManager implements IJobM
   public void resetSeedingWorkerStatus(String processID)
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Resetting seeding status");
+    Logging.jobs.info("Resetting seeding status");
     while (true)
     {
       long sleepAmt = 0L;
@@ -1152,7 +1151,7 @@ public class JobManager implements IJobM
       }
     }
 
-    Logging.jobs.debug("Reset complete");
+    Logging.jobs.info("Reset complete");
   }
 
   /** Reset as part of restoring doc delete threads.
@@ -1162,7 +1161,7 @@ public class JobManager implements IJobM
   public void resetDocDeleteWorkerStatus(String processID)
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Resetting doc deleting status");
+    Logging.jobs.info("Resetting doc deleting status");
     while (true)
     {
       long sleepAmt = 0L;
@@ -1201,7 +1200,7 @@ public class JobManager implements IJobM
       }
     }
 
-    Logging.jobs.debug("Reset complete");
+    Logging.jobs.info("Reset complete");
   }
 
   /** Reset as part of restoring doc cleanup threads.
@@ -1211,7 +1210,7 @@ public class JobManager implements IJobM
   public void resetDocCleanupWorkerStatus(String processID)
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Resetting doc cleaning status");
+    Logging.jobs.info("Resetting doc cleaning status");
     while (true)
     {
       long sleepAmt = 0L;
@@ -1250,7 +1249,7 @@ public class JobManager implements IJobM
       }
     }
 
-    Logging.jobs.debug("Reset complete");
+    Logging.jobs.info("Reset complete");
   }
 
   /** Reset as part of restoring delete startup threads.
@@ -1260,7 +1259,7 @@ public class JobManager implements IJobM
   public void resetDeleteStartupWorkerStatus(String processID)
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Resetting job delete starting up status");
+    Logging.jobs.info("Resetting job delete starting up status");
     while (true)
     {
       long sleepAmt = 0L;
@@ -1299,7 +1298,7 @@ public class JobManager implements IJobM
       }
     }
 
-    Logging.jobs.debug("Reset complete");
+    Logging.jobs.info("Reset complete");
   }
 
   /** Reset as part of restoring notification threads.
@@ -1308,7 +1307,7 @@ public class JobManager implements IJobM
   public void resetNotificationWorkerStatus(String processID)
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Resetting notification worker status");
+    Logging.jobs.info("Resetting notification worker status");
     while (true)
     {
       long sleepAmt = 0L;
@@ -1347,7 +1346,7 @@ public class JobManager implements IJobM
       }
     }
 
-    Logging.jobs.debug("Reset complete");
+    Logging.jobs.info("Reset complete");
   }
 
   /** Reset as part of restoring startup threads.
@@ -1356,7 +1355,7 @@ public class JobManager implements IJobM
   public void resetStartupWorkerStatus(String processID)
     throws ManifoldCFException
   {
-    Logging.jobs.debug("Resetting job starting up status");
+    Logging.jobs.info("Resetting job starting up status");
     while (true)
     {
       long sleepAmt = 0L;
@@ -1395,7 +1394,7 @@ public class JobManager implements IJobM
       }
     }
 
-    Logging.jobs.debug("Reset complete");
+    Logging.jobs.info("Reset complete");
   }
 
   // These methods support job delete threads
@@ -5872,11 +5871,8 @@ public class JobManager implements IJobM
             windowEnd = new Long(matchTime.longValue()+duration.longValue());
           }
 
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job '"+jobID+"' is within run window at "+new Long(currentTime).toString()+"
ms. (which starts at "+
+          Logging.jobs.info("Job '"+jobID+"' is within run window at "+new Long(currentTime).toString()+"
ms. (which starts at "+
               matchTime.toString()+" ms."+((duration==null)?"":(" and goes for "+duration.toString()+"
ms."))+")");
-          }
 
           int newJobState;
           switch (status)
@@ -5887,60 +5883,39 @@ public class JobManager implements IJobM
             // This does not get logged because the startup thread does the logging.
             jobs.startJob(jobID,windowEnd,requestMinimum);
             jobQueue.clearFailTimes(jobID);
-            if (Logging.jobs.isDebugEnabled())
-            {
-              Logging.jobs.debug("Signalled for job start for job "+jobID);
-            }
+            Logging.jobs.info("Signalled for job start for job "+jobID);
             break;
           case Jobs.STATUS_ACTIVEWAIT:
             unwaitList.add(jobID);
             jobs.unwaitJob(jobID,Jobs.STATUS_RESUMING,windowEnd);
             jobQueue.clearFailTimes(jobID);
-            if (Logging.jobs.isDebugEnabled())
-            {
-              Logging.jobs.debug("Un-waited job "+jobID);
-            }
+            Logging.jobs.info("Un-waited job "+jobID);
             break;
           case Jobs.STATUS_ACTIVEWAITSEEDING:
             unwaitList.add(jobID);
             jobs.unwaitJob(jobID,Jobs.STATUS_RESUMINGSEEDING,windowEnd);
             jobQueue.clearFailTimes(jobID);
-            if (Logging.jobs.isDebugEnabled())
-            {
-              Logging.jobs.debug("Un-waited job "+jobID);
-            }
+            Logging.jobs.info("Un-waited job "+jobID);
             break;
           case Jobs.STATUS_PAUSEDWAIT:
             unwaitList.add(jobID);
             jobs.unwaitJob(jobID,jobs.STATUS_PAUSED,windowEnd);
-            if (Logging.jobs.isDebugEnabled())
-            {
-              Logging.jobs.debug("Un-waited (but still paused) job "+jobID);
-            }
+            Logging.jobs.info("Un-waited (but still paused) job "+jobID);
             break;
           case Jobs.STATUS_PAUSEDWAITSEEDING:
             unwaitList.add(jobID);
             jobs.unwaitJob(jobID,jobs.STATUS_PAUSEDSEEDING,windowEnd);
-            if (Logging.jobs.isDebugEnabled())
-            {
-              Logging.jobs.debug("Un-waited (but still paused) job "+jobID);
-            }
+            Logging.jobs.info("Un-waited (but still paused) job "+jobID);
             break;
           case Jobs.STATUS_PAUSINGWAITING:
             unwaitList.add(jobID);
             jobs.unwaitJob(jobID,jobs.STATUS_PAUSING,windowEnd);
-            if (Logging.jobs.isDebugEnabled())
-            {
-              Logging.jobs.debug("Un-waited (but still paused) job "+jobID);
-            }
+            Logging.jobs.info("Un-waited (but still paused) job "+jobID);
             break;
           case Jobs.STATUS_PAUSINGWAITINGSEEDING:
             unwaitList.add(jobID);
             jobs.unwaitJob(jobID,jobs.STATUS_PAUSINGSEEDING,windowEnd);
-            if (Logging.jobs.isDebugEnabled())
-            {
-              Logging.jobs.debug("Un-waited (but still paused) job "+jobID);
-            }
+            Logging.jobs.info("Un-waited (but still paused) job "+jobID);
             break;
           default:
             break;
@@ -6027,46 +6002,28 @@ public class JobManager implements IJobM
         case Jobs.STATUS_ACTIVE:
         case Jobs.STATUS_ACTIVE_UNINSTALLED:
           jobs.waitJob(jobID,Jobs.STATUS_ACTIVEWAITING);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job "+jobID+" now in 'wait' state due to window end");
-          }
+          Logging.jobs.info("Job "+jobID+" now in 'wait' state due to window end");
           break;
         case Jobs.STATUS_ACTIVESEEDING:
         case Jobs.STATUS_ACTIVESEEDING_UNINSTALLED:
           jobs.waitJob(jobID,Jobs.STATUS_ACTIVEWAITINGSEEDING);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job "+jobID+" now in 'wait' state due to window end");
-          }
+          Logging.jobs.info("Job "+jobID+" now in 'wait' state due to window end");
           break;
         case Jobs.STATUS_PAUSED:
           jobs.waitJob(jobID,Jobs.STATUS_PAUSEDWAIT);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job "+jobID+" now in 'wait paused' state due to window end");
-          }
+          Logging.jobs.info("Job "+jobID+" now in 'wait paused' state due to window end");
           break;
         case Jobs.STATUS_PAUSEDSEEDING:
           jobs.waitJob(jobID,Jobs.STATUS_PAUSEDWAITSEEDING);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job "+jobID+" now in 'wait paused' state due to window end");
-          }
+          Logging.jobs.info("Job "+jobID+" now in 'wait paused' state due to window end");
           break;
         case Jobs.STATUS_PAUSING:
           jobs.waitJob(jobID,Jobs.STATUS_PAUSINGWAITING);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job "+jobID+" now in 'wait paused' state due to window end");
-          }
+          Logging.jobs.info("Job "+jobID+" now in 'wait paused' state due to window end");
           break;
         case Jobs.STATUS_PAUSINGSEEDING:
           jobs.waitJob(jobID,Jobs.STATUS_PAUSINGWAITINGSEEDING);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job "+jobID+" now in 'wait paused' state due to window end");
-          }
+          Logging.jobs.info("Job "+jobID+" now in 'wait paused' state due to window end");
           break;
         default:
           break;
@@ -6349,19 +6306,13 @@ public class JobManager implements IJobM
         throw new ManifoldCFException("Job "+jobID+" is already running");
 
       IJobDescription jobDescription = jobs.load(jobID,true);
-      if (Logging.jobs.isDebugEnabled())
-      {
-        Logging.jobs.debug("Manually starting job "+jobID);
-      }
+      
+      Logging.jobs.info("Manually starting job "+jobID);
       // Start this job!  but with no end time.
       jobs.startJob(jobID,null,requestMinimum);
       jobQueue.clearFailTimes(jobID);
       
-      if (Logging.jobs.isDebugEnabled())
-      {
-        Logging.jobs.debug("Manual job start signal for job "+jobID+" successfully sent");
-      }
-
+      Logging.jobs.info("Manual job start signal for job "+jobID+" successfully sent");
     }
     catch (ManifoldCFException e)
     {
@@ -6388,8 +6339,7 @@ public class JobManager implements IJobM
     throws ManifoldCFException
   {
     jobs.noteJobDeleteStarted(jobID,startTime);
-    if (Logging.jobs.isDebugEnabled())
-      Logging.jobs.debug("Job "+jobID+" delete is now started");
+    Logging.jobs.info("Job "+jobID+" delete is now started");
   }
 
   /** Note job started.
@@ -6401,8 +6351,7 @@ public class JobManager implements IJobM
     throws ManifoldCFException
   {
     jobs.noteJobStarted(jobID,startTime,seedingVersion);
-    if (Logging.jobs.isDebugEnabled())
-      Logging.jobs.debug("Job "+jobID+" is now started");
+    Logging.jobs.info("Job "+jobID+" is now started");
   }
 
   /** Note job seeded.
@@ -6414,8 +6363,7 @@ public class JobManager implements IJobM
     throws ManifoldCFException
   {
     jobs.noteJobSeeded(jobID,seedingVersion);
-    if (Logging.jobs.isDebugEnabled())
-      Logging.jobs.debug("Job "+jobID+" has been successfully reseeded");
+    Logging.jobs.info("Job "+jobID+" has been successfully reseeded");
   }
 
   /** Prepare for a delete scan.
@@ -6646,10 +6594,8 @@ public class JobManager implements IJobM
   {
     // Just whack status back to "INACTIVE".  The active documents will continue to be processed
until done,
     // but that's fine.  There will be no finishing stage, obviously.
-    if (Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Manually aborting job "+jobID);
-    }
+    Logging.jobs.info("Manually aborting job "+jobID);
+
     while (true)
     {
       long sleepAmt = 0L;
@@ -6683,10 +6629,8 @@ public class JobManager implements IJobM
         sleepFor(sleepAmt);
       }
     }
-    if (Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Job "+jobID+" abort signal successfully sent");
-    }
+    
+    Logging.jobs.info("Job "+jobID+" abort signal successfully sent");
   }
 
   /** Manually restart a running job.  The job will be stopped and restarted.  Any schedule
affinity will be lost,
@@ -6698,10 +6642,8 @@ public class JobManager implements IJobM
   public void manualAbortRestart(Long jobID, boolean requestMinimum)
     throws ManifoldCFException
   {
-    if (Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Manually restarting job "+jobID);
-    }
+    Logging.jobs.info("Manually restarting job "+jobID);
+
     while (true)
     {
       long sleepAmt = 0L;
@@ -6735,10 +6677,8 @@ public class JobManager implements IJobM
         sleepFor(sleepAmt);
       }
     }
-    if (Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Job "+jobID+" restart signal successfully sent");
-    }
+
+    Logging.jobs.info("Job "+jobID+" restart signal successfully sent");
   }
 
   /** Manually restart a running job.  The job will be stopped and restarted.  Any schedule
affinity will be lost,
@@ -6763,10 +6703,8 @@ public class JobManager implements IJobM
   {
     // Just whack status back to "INACTIVE".  The active documents will continue to be processed
until done,
     // but that's fine.  There will be no finishing stage, obviously.
-    if (Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Aborting job "+jobID+" due to error '"+errorText+"'");
-    }
+    Logging.jobs.info("Aborting job "+jobID+" due to error '"+errorText+"'");
+    
     boolean rval;
     while (true)
     {
@@ -6801,10 +6739,9 @@ public class JobManager implements IJobM
         sleepFor(sleepAmt);
       }
     }
-    if (rval && Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Job "+jobID+" abort signal successfully sent");
-    }
+    
+    Logging.jobs.info("Job "+jobID+" abort signal successfully sent");
+      
     return rval;
   }
 
@@ -6815,10 +6752,8 @@ public class JobManager implements IJobM
   public void pauseJob(Long jobID)
     throws ManifoldCFException
   {
-    if (Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Manually pausing job "+jobID);
-    }
+    Logging.jobs.info("Manually pausing job "+jobID);
+      
     while (true)
     {
       long sleepAmt = 0L;
@@ -6853,10 +6788,7 @@ public class JobManager implements IJobM
       }
     }
 
-    if (Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Job "+jobID+" successfully paused");
-    }
+    Logging.jobs.info("Job "+jobID+" successfully paused");
 
   }
 
@@ -6867,10 +6799,8 @@ public class JobManager implements IJobM
   public void restartJob(Long jobID)
     throws ManifoldCFException
   {
-    if (Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Manually restarting paused job "+jobID);
-    }
+    Logging.jobs.info("Manually restarting paused job "+jobID);
+      
     while (true)
     {
       long sleepAmt = 0L;
@@ -6906,10 +6836,7 @@ public class JobManager implements IJobM
       }
     }
 
-    if (Logging.jobs.isDebugEnabled())
-    {
-      Logging.jobs.debug("Job "+jobID+" successfully restarted");
-    }
+    Logging.jobs.info("Job "+jobID+" successfully restarted");
   }
 
   /** Get the list of jobs that are ready for seeding.
@@ -6979,10 +6906,8 @@ public class JobManager implements IJobM
           // Mark status of job as "active/seeding".  Special status is needed so that abort
           // will not complete until seeding is completed.
           jobs.writeTransientStatus(jobID,jobs.STATUS_ACTIVESEEDING,reseedTime,processID);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Marked job "+jobID+" for seeding");
-          }
+          Logging.jobs.info("Marked job "+jobID+" for seeding");
+            
           rval[i] = new JobSeedingRecord(jobID,seedingVersionString,failTime,failRetryCount);
           i++;
         }
@@ -7048,10 +6973,7 @@ public class JobManager implements IJobM
 
           // Mark status of job as "starting delete"
           jobs.writeTransientStatus(jobID,jobs.STATUS_DELETESTARTINGUP,processID);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Marked job "+jobID+" for delete startup");
-          }
+          Logging.jobs.info("Marked job "+jobID+" for delete startup");
 
           rval[i] = new JobDeleteRecord(jobID);
           i++;
@@ -7141,10 +7063,7 @@ public class JobManager implements IJobM
           
           // Mark status of job as "starting"
           jobs.writeTransientStatus(jobID,requestMinimum?jobs.STATUS_STARTINGUPMINIMAL:jobs.STATUS_STARTINGUP,processID);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Marked job "+jobID+" for startup");
-          }
+          Logging.jobs.info("Marked job "+jobID+" for startup");
 
           rval[i] = new JobStartRecord(jobID,seedingVersionString,requestMinimum,failTime,failRetryCount);
           i++;
@@ -7285,10 +7204,8 @@ public class JobManager implements IJobM
           // Nothing is in a critical section - so this should be OK.
           hopCount.deleteOwner(jobID);
           jobs.delete(jobID);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Removed job "+jobID);
-          }
+          
+          Logging.jobs.info("Removed job "+jobID);          
           break;
         default:
           throw new ManifoldCFException("Unexpected job status: "+Integer.toString(status));
@@ -7353,8 +7270,7 @@ public class JobManager implements IJobM
         switch (status)
         {
         case Jobs.STATUS_DELETESTARTINGUP:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'ReadyForDelete' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'ReadyForDelete' state");
 
           // Set the state of the job back to "ReadyForStartup"
           jobs.writePermanentStatus(jobID,jobs.STATUS_READYFORDELETE,true);
@@ -7422,8 +7338,7 @@ public class JobManager implements IJobM
         switch (status)
         {
         case Jobs.STATUS_NOTIFYINGOFCOMPLETION:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'ReadyForNotify' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'ReadyForNotify' state");
 
           // Set the state of the job back to "ReadyForNotify"
           jobs.writePermanentStatus(jobID,jobs.STATUS_READYFORNOTIFY,true);
@@ -7491,8 +7406,7 @@ public class JobManager implements IJobM
         switch (status)
         {
         case Jobs.STATUS_NOTIFYINGOFDELETION:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'ReadyForDeleteNotify' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'ReadyForDeleteNotify' state");
 
           // Set the state of the job back to "ReadyForNotify"
           jobs.writePermanentStatus(jobID,jobs.STATUS_READYFORDELETENOTIFY,true);
@@ -7559,27 +7473,23 @@ public class JobManager implements IJobM
         switch (status)
         {
         case Jobs.STATUS_STARTINGUP:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'ReadyForStartup' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'ReadyForStartup' state");
 
           // Set the state of the job back to "ReadyForStartup"
           jobs.writePermanentStatus(jobID,jobs.STATUS_READYFORSTARTUP,true);
           break;
         case Jobs.STATUS_STARTINGUPMINIMAL:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'ReadyForStartupMinimal' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'ReadyForStartupMinimal' state");
 
           // Set the state of the job back to "ReadyForStartupMinimal"
           jobs.writePermanentStatus(jobID,jobs.STATUS_READYFORSTARTUPMINIMAL,true);
           break;
         case Jobs.STATUS_ABORTINGSTARTINGUPFORRESTART:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" to 'AbortingForRestart' state");
+          Logging.jobs.info("Setting job "+jobID+" to 'AbortingForRestart' state");
           jobs.writePermanentStatus(jobID,jobs.STATUS_ABORTINGFORRESTART,true);
           break;
         case Jobs.STATUS_ABORTINGSTARTINGUPFORRESTARTMINIMAL:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" to 'AbortingForRestartMinimal' state");
+          Logging.jobs.info("Setting job "+jobID+" to 'AbortingForRestartMinimal' state");
           jobs.writePermanentStatus(jobID,jobs.STATUS_ABORTINGFORRESTARTMINIMAL,true);
           break;
 
@@ -7651,52 +7561,45 @@ public class JobManager implements IJobM
         switch (status)
         {
         case Jobs.STATUS_ACTIVESEEDING_UNINSTALLED:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'Active_Uninstalled' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'Active_Uninstalled' state");
 
           // Set the state of the job back to "Active"
           jobs.writePermanentStatus(jobID,jobs.STATUS_ACTIVE_UNINSTALLED);
           break;
         case Jobs.STATUS_ACTIVESEEDING:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'Active' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'Active' state");
 
           // Set the state of the job back to "Active"
           jobs.writePermanentStatus(jobID,jobs.STATUS_ACTIVE);
           break;
         case Jobs.STATUS_ACTIVEWAITSEEDING:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'ActiveWait' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'ActiveWait' state");
 
           // Set the state of the job back to "Active"
           jobs.writePermanentStatus(jobID,jobs.STATUS_ACTIVEWAIT);
           break;
         case Jobs.STATUS_PAUSEDSEEDING:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'Paused' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'Paused' state");
 
           // Set the state of the job back to "Active"
           jobs.writePermanentStatus(jobID,jobs.STATUS_PAUSED);
           break;
         case Jobs.STATUS_PAUSEDWAITSEEDING:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'PausedWait' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'PausedWait' state");
 
           // Set the state of the job back to "Active"
           jobs.writePermanentStatus(jobID,jobs.STATUS_PAUSEDWAIT);
           break;
 
         case Jobs.STATUS_ABORTINGFORRESTARTSEEDING:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'AbortingForRestart' state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'AbortingForRestart' state");
 
           // Set the state of the job back to "Active"
           jobs.writePermanentStatus(jobID,jobs.STATUS_ABORTINGFORRESTART);
           break;
 
         case Jobs.STATUS_ABORTINGFORRESTARTSEEDINGMINIMAL:
-          if (Logging.jobs.isDebugEnabled())
-            Logging.jobs.debug("Setting job "+jobID+" back to 'AbortingForRestartMinimal'
state");
+          Logging.jobs.info("Setting job "+jobID+" back to 'AbortingForRestartMinimal' state");
 
           // Set the state of the job back to "Active"
           jobs.writePermanentStatus(jobID,jobs.STATUS_ABORTINGFORRESTARTMINIMAL);
@@ -7808,11 +7711,7 @@ public class JobManager implements IJobM
             continue;
 
           jobs.finishJobCleanup(jobID);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job "+jobID+" cleanup is now completed");
-          }
-
+          Logging.jobs.info("Job "+jobID+" cleanup is now completed");
         }
         database.performCommit();
         return;
@@ -7911,10 +7810,7 @@ public class JobManager implements IJobM
 
           // Mark status of job as "finishing"
           jobs.writePermanentStatus(jobID,jobs.STATUS_SHUTTINGDOWN,true);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Marked job "+jobID+" for shutdown");
-          }
+          Logging.jobs.info("Marked job "+jobID+" for shutdown");
 
         }
         database.performCommit();
@@ -7992,10 +7888,8 @@ public class JobManager implements IJobM
       
           // Mark status of job as "starting delete"
           jobs.writeTransientStatus(jobID,jobs.STATUS_NOTIFYINGOFCOMPLETION,processID);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Found job "+jobID+" in need of notification");
-          }
+          Logging.jobs.info("Found job "+jobID+" in need of notification");
+            
           rval[i++] = new JobNotifyRecord(jobID,failTime,failRetryCount);
         }
         database.performCommit();
@@ -8073,10 +7967,8 @@ public class JobManager implements IJobM
       
           // Mark status of job as "starting delete"
           jobs.writeTransientStatus(jobID,jobs.STATUS_NOTIFYINGOFDELETION,processID);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Found job "+jobID+" in need of delete notification");
-          }
+          Logging.jobs.info("Found job "+jobID+" in need of delete notification");
+
           rval[i++] = new JobNotifyRecord(jobID,failTime,failRetryCount);
         }
         database.performCommit();
@@ -8148,10 +8040,7 @@ public class JobManager implements IJobM
 
         jobs.finishResumeJob(jobID,timestamp);
             
-        if (Logging.jobs.isDebugEnabled())
-        {
-          Logging.jobs.debug("Resumed job "+jobID);
-        }
+        Logging.jobs.info("Resumed job "+jobID);
       }
     }
     finally
@@ -8238,10 +8127,7 @@ public class JobManager implements IJobM
 
         jobs.finishStopJob(jobID,timestamp);
             
-        if (Logging.jobs.isDebugEnabled())
-        {
-          Logging.jobs.debug("Stopped job "+jobID);
-        }
+        Logging.jobs.info("Stopped job "+jobID);
       }
     }
     finally
@@ -8373,10 +8259,7 @@ public class JobManager implements IJobM
         {
           // This job needs to re-enter the active state.  Make that happen.
           jobs.returnJobToActive(jobID);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job "+jobID+" is re-entering active state");
-          }
+          Logging.jobs.info("Job "+jobID+" is re-entering active state");
         }
         else
         {
@@ -8385,10 +8268,7 @@ public class JobManager implements IJobM
           resetJobs.add(jobDesc);
               
           jobs.finishJob(jobID,currentTime);
-          if (Logging.jobs.isDebugEnabled())
-          {
-            Logging.jobs.debug("Job "+jobID+" now completed");
-          }
+          Logging.jobs.info("Job "+jobID+" now completed");
         }
       }
     }



Mime
View raw message