Browse Source

底层日志底层日志调整,非敏感日志level调整为debug;

xueli.xue 8 years ago
parent
commit
859207d05e

+ 2 - 0
README.md View File

708
 - 1、IP工具类获取IP逻辑优化,IP静态缓存;
708
 - 1、IP工具类获取IP逻辑优化,IP静态缓存;
709
 - 2、执行器、调度中心,均支持自定义注册IP地址;解决机器多网卡时错误网卡注册的情况;
709
 - 2、执行器、调度中心,均支持自定义注册IP地址;解决机器多网卡时错误网卡注册的情况;
710
 - 3、任务跨天执行时生成多份日志文件的问题修复;
710
 - 3、任务跨天执行时生成多份日志文件的问题修复;
711
+- 4、底层日志底层日志调整,非敏感日志level调整为debug;
712
+- 5、执行器AppName必须在调度中心配置才允许注册,一个AppName可以配置多个执行器,将会同时注册到对应执行器上;
711
 
713
 
712
 
714
 
713
 #### 规划中
715
 #### 规划中

+ 0 - 19
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java View File

45
 	public String index(Model model, String jobGroup, String jobName) {
45
 	public String index(Model model, String jobGroup, String jobName) {
46
 
46
 
47
 		// 任务组
47
 		// 任务组
48
-
49
 		List<XxlJobGroup> jobGroupList =  xxlJobGroupDao.findAll();
48
 		List<XxlJobGroup> jobGroupList =  xxlJobGroupDao.findAll();
50
 
49
 
51
 		model.addAttribute("jobGroup", jobGroup);
50
 		model.addAttribute("jobGroup", jobGroup);
92
 		return maps;
91
 		return maps;
93
 	}
92
 	}
94
 	
93
 	
95
-	/*@RequestMapping("/save")
96
-	@ResponseBody
97
-	@PermessionLimit(limit=false)
98
-	public RemoteCallBack triggerLog(int trigger_log_id, String status, String msg) {
99
-		RemoteCallBack callBack = new RemoteCallBack();
100
-		callBack.setStatus(RemoteCallBack.FAIL);
101
-		XxlJobLog log = xxlJobLogDao.load(trigger_log_id);
102
-		if (log!=null) {
103
-			log.setHandleTime(new Date());
104
-			log.setHandleStatus(status);
105
-			log.setHandleMsg(msg);
106
-			xxlJobLogDao.updateHandleInfo(log);
107
-			callBack.setStatus(RemoteCallBack.SUCCESS);
108
-			return callBack;
109
-		}
110
-		return callBack;
111
-	}*/
112
-	
113
 	@RequestMapping("/logDetail")
94
 	@RequestMapping("/logDetail")
114
 	@ResponseBody
95
 	@ResponseBody
115
 	public ReturnT<String> logDetail(int id){
96
 	public ReturnT<String> logDetail(int id){

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java View File

22
 	@Override
22
 	@Override
23
 	public ModelAndView resolveException(HttpServletRequest request,
23
 	public ModelAndView resolveException(HttpServletRequest request,
24
 			HttpServletResponse response, Object handler, Exception ex) {
24
 			HttpServletResponse response, Object handler, Exception ex) {
25
-		logger.error("system catch exception:{}", ex);
25
+		logger.error("WebExceptionResolver:{}", ex);
26
 		
26
 		
27
 		ModelAndView mv = new ModelAndView();
27
 		ModelAndView mv = new ModelAndView();
28
 		HandlerMethod method = (HandlerMethod)handler;
28
 		HandlerMethod method = (HandlerMethod)handler;

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServer.java View File

15
 public class XxlJobLogCallbackServer {
15
 public class XxlJobLogCallbackServer {
16
     private static final Logger logger = LoggerFactory.getLogger(XxlJobLogCallbackServer.class);
16
     private static final Logger logger = LoggerFactory.getLogger(XxlJobLogCallbackServer.class);
17
 
17
 
18
-    Server server = null;
18
+    private Server server = null;
19
     public void start(int callBackPort) throws Exception {
19
     public void start(int callBackPort) throws Exception {
20
 
20
 
21
     	final int port = Integer.valueOf(callBackPort);
21
     	final int port = Integer.valueOf(callBackPort);

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java View File

42
 		jobLog.setJobGroup(jobInfo.getJobGroup());
42
 		jobLog.setJobGroup(jobInfo.getJobGroup());
43
 		jobLog.setJobName(jobInfo.getJobName());
43
 		jobLog.setJobName(jobInfo.getJobName());
44
 		DynamicSchedulerUtil.xxlJobLogDao.save(jobLog);
44
 		DynamicSchedulerUtil.xxlJobLogDao.save(jobLog);
45
-		logger.info(">>>>>>>>>>> xxl-job trigger start, jobId:{}", jobLog.getId());
45
+		logger.debug(">>>>>>>>>>> xxl-job trigger start, jobId:{}", jobLog.getId());
46
 
46
 
47
         // admin address
47
         // admin address
48
         List<String> adminAddressList = JobRegistryHelper.discover(RegistHelper.RegistType.ADMIN.name(), RegistHelper.RegistType.ADMIN.name());
48
         List<String> adminAddressList = JobRegistryHelper.discover(RegistHelper.RegistType.ADMIN.name(), RegistHelper.RegistType.ADMIN.name());
89
 		// monitor triger
89
 		// monitor triger
90
 		JobMonitorHelper.monitor(jobLog.getId());
90
 		JobMonitorHelper.monitor(jobLog.getId());
91
 		
91
 		
92
-		logger.info(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
92
+		logger.debug(">>>>>>>>>>> xxl-job trigger end, jobId:{}", jobLog.getId());
93
     }
93
     }
94
 	
94
 	
95
 	
95
 	

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java View File

35
 			public void run() {
35
 			public void run() {
36
 				while (true) {
36
 				while (true) {
37
 					try {
37
 					try {
38
-						logger.info(">>>>>>>>>>> job monitor beat ... ");
38
+						logger.debug(">>>>>>>>>>> job monitor beat ... ");
39
 						Integer jobLogId = JobMonitorHelper.helper.queue.take();
39
 						Integer jobLogId = JobMonitorHelper.helper.queue.take();
40
 						if (jobLogId != null && jobLogId > 0) {
40
 						if (jobLogId != null && jobLogId > 0) {
41
 							logger.info(">>>>>>>>>>> job monitor heat success, JobLogId:{}", jobLogId);
41
 							logger.info(">>>>>>>>>>> job monitor heat success, JobLogId:{}", jobLogId);

+ 1 - 1
xxl-job-core/src/main/java/com/xxl/job/core/registry/impl/DbRegistHelper.java View File

21
         String insertSql = "INSERT INTO XXL_JOB_QRTZ_TRIGGER_REGISTRY( `registry_group` , `registry_key` , `registry_value`, `update_time`) VALUES(? , ? , ?, NOW())";
21
         String insertSql = "INSERT INTO XXL_JOB_QRTZ_TRIGGER_REGISTRY( `registry_group` , `registry_key` , `registry_value`, `update_time`) VALUES(? , ? , ?, NOW())";
22
         int ret = DBUtil.update(dataSource, updateSql, new Object[]{registGroup, registryKey, registryValue});
22
         int ret = DBUtil.update(dataSource, updateSql, new Object[]{registGroup, registryKey, registryValue});
23
         if (ret<1) {
23
         if (ret<1) {
24
-            ret = DBUtil.update(dataSource, insertSql, new Object[]{registGroup, registryKey, registryValue});
24
+            //ret = DBUtil.update(dataSource, insertSql, new Object[]{registGroup, registryKey, registryValue});
25
         }
25
         }
26
         return ret;
26
         return ret;
27
     }
27
     }

+ 6 - 8
xxl-job-core/src/main/java/com/xxl/job/core/router/thread/JobThread.java View File

40
 
40
 
41
 	public void pushTriggerQueue(RequestModel requestModel) {
41
 	public void pushTriggerQueue(RequestModel requestModel) {
42
 		if (triggerLogIdSet.contains(requestModel.getLogId())) {
42
 		if (triggerLogIdSet.contains(requestModel.getLogId())) {
43
-			logger.info("repeate trigger job, logId:{}", requestModel.getLogId());
43
+			logger.debug("repeate trigger job, logId:{}", requestModel.getLogId());
44
 			return;
44
 			return;
45
 		}
45
 		}
46
 
46
 
58
 		this.stopReason = stopReason;
58
 		this.stopReason = stopReason;
59
 	}
59
 	}
60
 	
60
 	
61
-
62
-	
63
 	int i = 1;
61
 	int i = 1;
64
 	@Override
62
 	@Override
65
 	public void run() {
63
 	public void run() {
83
 						String logFileName = XxlJobFileAppender.makeLogFileName(new Date(triggerDate.getLogDateTim()), triggerDate.getLogId());
81
 						String logFileName = XxlJobFileAppender.makeLogFileName(new Date(triggerDate.getLogDateTim()), triggerDate.getLogId());
84
 
82
 
85
 						XxlJobFileAppender.contextHolder.set(logFileName);
83
 						XxlJobFileAppender.contextHolder.set(logFileName);
86
-						logger.info("----------- xxl-job job handle start -----------");
84
+						logger.info("----------- xxl-job job execute start -----------");
87
 						handler.execute(handlerParams);
85
 						handler.execute(handlerParams);
88
 					} catch (Exception e) {
86
 					} catch (Exception e) {
89
-						logger.info("JobThread Exception:", e);
87
+						logger.error("JobThread Exception:", e);
90
 						_status = ResponseModel.FAIL;
88
 						_status = ResponseModel.FAIL;
91
 						StringWriter out = new StringWriter();
89
 						StringWriter out = new StringWriter();
92
 						e.printStackTrace(new PrintWriter(out));
90
 						e.printStackTrace(new PrintWriter(out));
93
 						_msg = out.toString();
91
 						_msg = out.toString();
94
 					}
92
 					}
95
-					logger.info("----------- xxl-job job handle end ----------- <br> Look : ExecutorParams:{}, Status:{}, Msg:{}",
93
+					logger.info("----------- xxl-job job execute end ----------- <br> Look : ExecutorParams:{}, Status:{}, Msg:{}",
96
 							new Object[]{handlerParams, _status, _msg});
94
 							new Object[]{handlerParams, _status, _msg});
97
 					
95
 					
98
 					// callback handler info
96
 					// callback handler info
109
 					}
107
 					}
110
 				}
108
 				}
111
 			} catch (Exception e) {
109
 			} catch (Exception e) {
112
-				logger.info("JobThread Exception:", e);
110
+				logger.error("----------- xxl-job JobThread Exception:", e);
113
 			}
111
 			}
114
 		}
112
 		}
115
 		
113
 		
124
 			}
122
 			}
125
 		}
123
 		}
126
 		
124
 		
127
-		logger.info(">>>>>>>>>>>> xxl-job handlerThrad stoped, hashCode:{}", Thread.currentThread());
125
+		logger.info(">>>>>>>>>>>> xxl-job JobThread stoped, hashCode:{}", Thread.currentThread());
128
 	}
126
 	}
129
 }
127
 }

+ 1 - 1
xxl-job-core/src/main/java/com/xxl/job/core/router/thread/TriggerCallbackThread.java View File

31
                                         break;
31
                                         break;
32
                                     }
32
                                     }
33
                                 } catch (Exception e) {
33
                                 } catch (Exception e) {
34
-                                    logger.info("JobThread Exception:", e);
34
+                                    logger.error(">>>>>>>>>>> xxl-job TriggerCallbackThread Exception:", e);
35
                                 }
35
                                 }
36
                             }
36
                             }
37
                         }
37
                         }

+ 4 - 4
xxl-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java View File

49
 				return localAddress;
49
 				return localAddress;
50
 			}
50
 			}
51
 		} catch (Throwable e) {
51
 		} catch (Throwable e) {
52
-			logger.warn("Failed to retriving ip address, " + e.getMessage(), e);
52
+			logger.error("Failed to retriving ip address, " + e.getMessage(), e);
53
 		}
53
 		}
54
 		try {
54
 		try {
55
 			Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
55
 			Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
66
 										return address;
66
 										return address;
67
 									}
67
 									}
68
 								} catch (Throwable e) {
68
 								} catch (Throwable e) {
69
-									logger.warn("Failed to retriving ip address, " + e.getMessage(), e);
69
+									logger.error("Failed to retriving ip address, " + e.getMessage(), e);
70
 								}
70
 								}
71
 							}
71
 							}
72
 						}
72
 						}
73
 					} catch (Throwable e) {
73
 					} catch (Throwable e) {
74
-						logger.warn("Failed to retriving ip address, " + e.getMessage(), e);
74
+						logger.error("Failed to retriving ip address, " + e.getMessage(), e);
75
 					}
75
 					}
76
 				}
76
 				}
77
 			}
77
 			}
78
 		} catch (Throwable e) {
78
 		} catch (Throwable e) {
79
-			logger.warn("Failed to retriving ip address, " + e.getMessage(), e);
79
+			logger.error("Failed to retriving ip address, " + e.getMessage(), e);
80
 		}
80
 		}
81
 		logger.error("Could not get local host ip address, will use 127.0.0.1 instead.");
81
 		logger.error("Could not get local host ip address, will use 127.0.0.1 instead.");
82
 		return localAddress;
82
 		return localAddress;

+ 3 - 3
xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobNetCommUtil.java View File

112
 			HttpEntity entity = response.getEntity();
112
 			HttpEntity entity = response.getEntity();
113
 			if (response.getStatusLine().getStatusCode() == 200 && null != entity) {
113
 			if (response.getStatusLine().getStatusCode() == 200 && null != entity) {
114
                 String responseHex = EntityUtils.toString(entity, "UTF-8");
114
                 String responseHex = EntityUtils.toString(entity, "UTF-8");
115
-				logger.info("xxl-job, net comm success, requestHex:{}, responseHex:{}", requestHex, responseHex);
115
+				logger.debug("xxl-job, net comm success, requestHex:{}, responseHex:{}", requestHex, responseHex);
116
 				EntityUtils.consume(entity);
116
 				EntityUtils.consume(entity);
117
 
117
 
118
                 // i do not know why
118
                 // i do not know why
133
 				failMsg = "http statusCode error, statusCode:" + response.getStatusLine().getStatusCode();
133
 				failMsg = "http statusCode error, statusCode:" + response.getStatusLine().getStatusCode();
134
 			}
134
 			}
135
 		} catch (Exception e) {
135
 		} catch (Exception e) {
136
-            logger.info("", e);
136
+            logger.error("", e);
137
 			/*StringWriter out = new StringWriter();
137
 			/*StringWriter out = new StringWriter();
138
 			e.printStackTrace(new PrintWriter(out));
138
 			e.printStackTrace(new PrintWriter(out));
139
 			callback.setMsg(out.toString());*/
139
 			callback.setMsg(out.toString());*/
146
 				try {
146
 				try {
147
 					httpClient.close();
147
 					httpClient.close();
148
 				} catch (IOException e) {
148
 				} catch (IOException e) {
149
-                    logger.info("", e);
149
+                    logger.error("", e);
150
 				}
150
 				}
151
 			}
151
 			}
152
 		}
152
 		}