Changeset 4502
- Timestamp:
- Sep 10, 2008, 11:52:50 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/config/dist/log4j.properties
r4187 r4502 4 4 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout 5 5 log4j.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.FileAppender9 #log4j.appender.file.File=hibernate.log10 #log4j.appender.file.layout=org.apache.log4j.PatternLayout11 #log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n12 13 ### direct messages to file migration.log ###14 log4j.appender.migfile=org.apache.log4j.FileAppender15 log4j.appender.migfile.File=migration.log16 log4j.appender.migfile.layout=org.apache.log4j.PatternLayout17 log4j.appender.migfile.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n18 19 ### Job agent log is written to jobagent.log in working directory ###20 log4j.appender.jobagent=org.apache.log4j.FileAppender21 log4j.appender.jobagent.File=jobagent.log22 log4j.appender.jobagent.layout=org.apache.log4j.PatternLayout23 log4j.appender.jobagent.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n24 6 25 7 ### set log levels - for more verbose logging change 'info' to 'debug' ### … … 65 47 # ----------------- 66 48 #log4j.logger.net.sf.basedb.clients.migrate=warn 67 log4j.logger.net.sf.basedb.clients.migrate=warn , migfile49 log4j.logger.net.sf.basedb.clients.migrate=warn 68 50 69 51 # ----------------- 70 52 # Job agent loggers 71 53 # ----------------- 72 log4j.logger.net.sf.basedb.clients.jobagent=warn , jobagent54 log4j.logger.net.sf.basedb.clients.jobagent=warn 73 55 74 56 # ----------------- -
trunk/credits.txt
r4483 r4502 27 27 USA. 28 28 29 30 The current BASE team is (at BASE 2.7.0 release) 29 The current BASE team is (at BASE 2.8.1 release) 31 30 32 31 Jari Häkkinen -
trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/Agent.java
r4478 r4502 210 210 */ 211 211 public static final int DEFAULT_CHECK_INTERVAL = 30; 212 213 static214 {215 org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent").setAdditivity(false);216 }217 212 218 213 /** … … 759 754 catch (Throwable t) 760 755 { 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); 763 758 } 764 759 } -
trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/AgentController.java
r4478 r4502 51 51 public class AgentController 52 52 { 53 static 54 { 55 org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent").setAdditivity(false); 56 } 57 53 58 54 /** 59 55 Log job agent events. -
trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/ThreadJobExecutor.java
r4478 r4502 90 90 dc = sc.newDbControl(); 91 91 92 // Load a fresh copy of the job item 92 // Load a fresh copy of the job item and settings 93 93 job = Job.getById(dc, job.getId()); 94 settings = JobAgentSettings.getById(dc, settings.getId()); 94 95 PluginExecutionRequest exec = null; 95 96 … … 97 98 { 98 99 exec = job.execute(null, Application.getHostName(), settings); 100 exec.registerSignalReceiver(signalReceiver); 99 101 } 100 102 catch (Throwable t) … … 104 106 log.error("Error executing job: " + job, t); 105 107 } 106 exec.registerSignalReceiver(signalReceiver);107 108 dc.commit(); 109 if (exec == null) return; 108 110 109 111 PluginResponse response = exec.invoke(); … … 181 183 182 184 impersonated = sc.impersonateLogin(job, "Running job: " + job.getName()); 183 if (job.getActiveProjectId() != 0) 185 int projectId = job.getActiveProjectId(); 186 if (projectId != 0) 184 187 { 185 188 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 } 188 199 dc.close(); 189 200 } -
trunk/src/core/net/sf/basedb/core/InternalJobQueue.java
r4479 r4502 483 483 catch (Throwable t) 484 484 { 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); 486 487 } 487 488 }
Note: See TracChangeset
for help on using the changeset viewer.