Changeset 3809

Timestamp:

Oct 8, 2007, 12:17:44 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #793: Job agent get logged out when waiting for a job to finish

Should be more stable now.

Location:

branches/2.4-stable/src

Files:

• clients/jobagent/net/sf/basedb/clients/jobagent/JobRunner.java (modified) (3 diffs)
• clients/jobagent/net/sf/basedb/clients/jobagent/executors/DummyJobExecutor.java (modified) (1 diff)
• clients/jobagent/net/sf/basedb/clients/jobagent/executors/ThreadJobExecutor.java (modified) (3 diffs)
• core/net/sf/basedb/core/Application.java (modified) (1 diff)

branches/2.4-stable/src/clients/jobagent/net/sf/basedb/clients/jobagent/JobRunner.java

@@ -26 +26 @@
 import java.util.Arrays;
 
+import net.sf.basedb.core.Application;
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.ItemModifiedException;
@@ -119 +120 @@
       }
       
+      // To protect the session control from timeouts
+      Application.Pinger pinger = Application.newPinger(sc);
       try
       {
@@ -131 +134 @@
         dc.commit();
         throw t;
+      }
+      finally
+      {
+        if (pinger != null) pinger.stop();
       }
       

branches/2.4-stable/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/DummyJobExecutor.java

@@ -81 +81 @@
   public void init(Agent agent)
   {
-    wait = Values.getInt(agent.getProperty("agent.executor.wait"), -1);
+    wait = Values.getInt(agent.getProperty("agent.executor.dummy.wait"), -1);
   }
   

branches/2.4-stable/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/ThreadJobExecutor.java

@@ -147 +147 @@
     SessionControl sc = null;
     SessionControl impersonated = null;
+    Application.Pinger pinger = null;
     try
     {
@@ -169 +170 @@
       
       Thread.currentThread().setPriority(threadPriority);
+      pinger = Application.newPinger(sc);
       executor.executeJob(impersonated, null, job, settings, null);
     }
@@ -178 +180 @@
     finally
     {
+      if (pinger != null) pinger.stop();
       if (dc != null) dc.close();
       if (impersonated != null && impersonated.isLoggedIn()) impersonated.logout();

branches/2.4-stable/src/core/net/sf/basedb/core/Application.java

@@ -459 +459 @@
         
         if (useInternalJobQueue == null) useInternalJobQueue = Config.getBoolean("jobqueue.internal.enabled");
+        log.info("jobqueue.internal.enabled = " + useInternalJobQueue);
         if (useInternalJobQueue)
         {