Changeset 4502

Timestamp:

Sep 10, 2008, 11:52:50 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Merged patch release 2.8.1 to the trunk.

Location:

trunk

Files:

• config/dist/log4j.properties (modified) (2 diffs)
• credits.txt (modified) (1 diff)
• src/clients/jobagent/net/sf/basedb/clients/jobagent/Agent.java (modified) (2 diffs)
• src/clients/jobagent/net/sf/basedb/clients/jobagent/AgentController.java (modified) (1 diff)
• src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/ThreadJobExecutor.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/InternalJobQueue.java (modified) (1 diff)

trunk/config/dist/log4j.properties

@@ -4 +4 @@
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### direct messages to file hibernate.log ###
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### direct messages to file migration.log ###
-log4j.appender.migfile=org.apache.log4j.FileAppender
-log4j.appender.migfile.File=migration.log
-log4j.appender.migfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.migfile.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### Job agent log is written to jobagent.log in working directory ###
-log4j.appender.jobagent=org.apache.log4j.FileAppender
-log4j.appender.jobagent.File=jobagent.log
-log4j.appender.jobagent.layout=org.apache.log4j.PatternLayout
-log4j.appender.jobagent.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
 ### set log levels - for more verbose logging change 'info' to 'debug' ###
@@ -65 +47 @@
 # -----------------
 #log4j.logger.net.sf.basedb.clients.migrate=warn
-log4j.logger.net.sf.basedb.clients.migrate=warn, migfile
+log4j.logger.net.sf.basedb.clients.migrate=warn
 
 # -----------------
 # Job agent loggers
 # -----------------
-log4j.logger.net.sf.basedb.clients.jobagent=warn, jobagent
+log4j.logger.net.sf.basedb.clients.jobagent=warn
 
 # -----------------

trunk/credits.txt

@@ -27 +27 @@
 USA.
 
-
-The current BASE team is (at BASE 2.7.0 release)
+The current BASE team is (at BASE 2.8.1 release)
 
 Jari Häkkinen

trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/Agent.java

@@ -210 +210 @@
   */
   public static final int DEFAULT_CHECK_INTERVAL = 30;
-  
-  static
-  {
-    org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent").setAdditivity(false);
-  }
   
   /**
@@ -759 +754 @@
         catch (Throwable t)
         {
-          log.error("Exception while setting active project to " + projectId + 
-            ". Continuing with no active project.", t);
+          log.warn("Exception while setting active project to Project[id=" + projectId + 
+            "]. Continuing with no active project.", t);
         }
       }

trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/AgentController.java

@@ -51 +51 @@
 public class AgentController
 {
-  static
-  {
-    org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent").setAdditivity(false);
-  }
-  
+
   /**
     Log job agent events.

trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/ThreadJobExecutor.java

@@ -90 +90 @@
       dc = sc.newDbControl();
       
-      // Load a fresh copy of the job item
+      // Load a fresh copy of the job item and settings
       job = Job.getById(dc, job.getId());
+      settings = JobAgentSettings.getById(dc, settings.getId());  
       PluginExecutionRequest exec = null;
       
@@ -97 +98 @@
       {
         exec = job.execute(null, Application.getHostName(), settings);
+        exec.registerSignalReceiver(signalReceiver);
       }
       catch (Throwable t)
@@ -104 +106 @@
         log.error("Error executing job: " + job, t);
       }
-      exec.registerSignalReceiver(signalReceiver);
       dc.commit();
+      if (exec == null) return;
 
       PluginResponse response = exec.invoke();
@@ -181 +183 @@
       
       impersonated = sc.impersonateLogin(job, "Running job: " + job.getName());
-      if (job.getActiveProjectId() != 0)
+      int projectId = job.getActiveProjectId();
+      if (projectId != 0)
       {
         dc = impersonated.newDbControl();
-        Project activeProject = Project.getById(dc, job.getActiveProjectId());
-        impersonated.setActiveProject(activeProject);
+        try
+        {
+          Project activeProject = Project.getById(dc, projectId);
+          impersonated.setActiveProject(activeProject);
+        }
+        catch (Throwable t)
+        {
+          log.warn("Exception while setting active project to Project[id=" + projectId + 
+              "]. Continuing with no active project.", t);
+        }
         dc.close();
       }

trunk/src/core/net/sf/basedb/core/InternalJobQueue.java

@@ -483 +483 @@
           catch (Throwable t)
           {
-            log.error("Exception while setting active project. Continuing with no active project.", t);
+            log.warn("Exception while setting active project to Project[id=" + projectId + 
+                "]. Continuing with no active project.", t);
           }
         }