Changeset 4502


Ignore:
Timestamp:
Sep 10, 2008, 11:52:50 AM (13 years ago)
Author:
Nicklas Nordborg
Message:

Merged patch release 2.8.1 to the trunk.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/config/dist/log4j.properties

    r4187 r4502  
    44log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
    55log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
    6 
    7 ### direct messages to file hibernate.log ###
    8 #log4j.appender.file=org.apache.log4j.FileAppender
    9 #log4j.appender.file.File=hibernate.log
    10 #log4j.appender.file.layout=org.apache.log4j.PatternLayout
    11 #log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
    12 
    13 ### direct messages to file migration.log ###
    14 log4j.appender.migfile=org.apache.log4j.FileAppender
    15 log4j.appender.migfile.File=migration.log
    16 log4j.appender.migfile.layout=org.apache.log4j.PatternLayout
    17 log4j.appender.migfile.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
    18 
    19 ### Job agent log is written to jobagent.log in working directory ###
    20 log4j.appender.jobagent=org.apache.log4j.FileAppender
    21 log4j.appender.jobagent.File=jobagent.log
    22 log4j.appender.jobagent.layout=org.apache.log4j.PatternLayout
    23 log4j.appender.jobagent.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
    246
    257### set log levels - for more verbose logging change 'info' to 'debug' ###
     
    6547# -----------------
    6648#log4j.logger.net.sf.basedb.clients.migrate=warn
    67 log4j.logger.net.sf.basedb.clients.migrate=warn, migfile
     49log4j.logger.net.sf.basedb.clients.migrate=warn
    6850
    6951# -----------------
    7052# Job agent loggers
    7153# -----------------
    72 log4j.logger.net.sf.basedb.clients.jobagent=warn, jobagent
     54log4j.logger.net.sf.basedb.clients.jobagent=warn
    7355
    7456# -----------------
  • trunk/credits.txt

    r4483 r4502  
    2727USA.
    2828
    29 
    30 The current BASE team is (at BASE 2.7.0 release)
     29The current BASE team is (at BASE 2.8.1 release)
    3130
    3231Jari Häkkinen
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/Agent.java

    r4478 r4502  
    210210  */
    211211  public static final int DEFAULT_CHECK_INTERVAL = 30;
    212  
    213   static
    214   {
    215     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent").setAdditivity(false);
    216   }
    217212 
    218213  /**
     
    759754        catch (Throwable t)
    760755        {
    761           log.error("Exception while setting active project to " + projectId +
    762             ". Continuing with no active project.", t);
     756          log.warn("Exception while setting active project to Project[id=" + projectId +
     757            "]. Continuing with no active project.", t);
    763758        }
    764759      }
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/AgentController.java

    r4478 r4502  
    5151public class AgentController
    5252{
    53   static
    54   {
    55     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent").setAdditivity(false);
    56   }
    57  
     53
    5854  /**
    5955    Log job agent events.
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/ThreadJobExecutor.java

    r4478 r4502  
    9090      dc = sc.newDbControl();
    9191     
    92       // Load a fresh copy of the job item
     92      // Load a fresh copy of the job item and settings
    9393      job = Job.getById(dc, job.getId());
     94      settings = JobAgentSettings.getById(dc, settings.getId()); 
    9495      PluginExecutionRequest exec = null;
    9596     
     
    9798      {
    9899        exec = job.execute(null, Application.getHostName(), settings);
     100        exec.registerSignalReceiver(signalReceiver);
    99101      }
    100102      catch (Throwable t)
     
    104106        log.error("Error executing job: " + job, t);
    105107      }
    106       exec.registerSignalReceiver(signalReceiver);
    107108      dc.commit();
     109      if (exec == null) return;
    108110
    109111      PluginResponse response = exec.invoke();
     
    181183     
    182184      impersonated = sc.impersonateLogin(job, "Running job: " + job.getName());
    183       if (job.getActiveProjectId() != 0)
     185      int projectId = job.getActiveProjectId();
     186      if (projectId != 0)
    184187      {
    185188        dc = impersonated.newDbControl();
    186         Project activeProject = Project.getById(dc, job.getActiveProjectId());
    187         impersonated.setActiveProject(activeProject);
     189        try
     190        {
     191          Project activeProject = Project.getById(dc, projectId);
     192          impersonated.setActiveProject(activeProject);
     193        }
     194        catch (Throwable t)
     195        {
     196          log.warn("Exception while setting active project to Project[id=" + projectId +
     197              "]. Continuing with no active project.", t);
     198        }
    188199        dc.close();
    189200      }
  • trunk/src/core/net/sf/basedb/core/InternalJobQueue.java

    r4479 r4502  
    483483          catch (Throwable t)
    484484          {
    485             log.error("Exception while setting active project. Continuing with no active project.", t);
     485            log.warn("Exception while setting active project to Project[id=" + projectId +
     486                "]. Continuing with no active project.", t);
    486487          }
    487488        }
Note: See TracChangeset for help on using the changeset viewer.