manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v4.1_dev

Browse Source
This commit is contained in:
thinkgem
2019-11-06 00:33:49 +08:00
parent 2329bd10de d07d90c4ab
commit e071e46bc8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java
View File

@@ -53,9 +53,9 @@ public class LogInterceptor extends BaseService implements HandlerInterceptor {
@Override @Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
Object handler, Exception ex) throws Exception { Object handler, Exception ex) throws Exception {
long beginTime = startTimeThreadLocal.get();// 得到线程绑定的局部变量（开始时间） Long beginTime = startTimeThreadLocal.get();// 得到线程绑定的局部变量（开始时间）
long endTime = System.currentTimeMillis(); // 2、结束时间 long endTime = System.currentTimeMillis(); // 2、结束时间
long executeTime = endTime - beginTime; // 3、获取执行时间 long executeTime = beginTime == null ? 0 : endTime - beginTime; // 3、获取执行时间
startTimeThreadLocal.remove(); // 用完之后销毁线程变量数据 startTimeThreadLocal.remove(); // 用完之后销毁线程变量数据
// 保存日志 // 保存日志

8
modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java
View File

@@ -45,7 +45,7 @@ import eu.bitwalker.useragentutils.UserAgent;
*/ */
public class LogUtils { public class LogUtils {
//采用线程池优化性能 // 采用线程池优化性能
private static ExecutorService logThreadPool = new ThreadPoolExecutor(5, 20, private static ExecutorService logThreadPool = new ThreadPoolExecutor(5, 20,
60L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), 60L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
new DefaultThreadFactory("log-save")); new DefaultThreadFactory("log-save"));
@@ -113,19 +113,19 @@ public class LogUtils {
} }
// 异步保存日志 // 异步保存日志
logThreadPool.submit(new SaveLogTask(log, handler, request.getContextPath(), throwable)); logThreadPool.submit(new SaveLogThread(log, handler, request.getContextPath(), throwable));
} }
/** /**
* 保存日志线程 * 保存日志线程
*/ */
public static class SaveLogTask extends Thread{ public static class SaveLogThread extends Thread{
private Log log; private Log log;
private Object handler; private Object handler;
private String contextPath; private String contextPath;
private Throwable throwable; private Throwable throwable;
public SaveLogTask(Log log, Object handler, String contextPath, Throwable throwable){ public SaveLogThread(Log log, Object handler, String contextPath, Throwable throwable){
this.log = log; this.log = log;
this.handler = handler; this.handler = handler;
this.contextPath = contextPath; this.contextPath = contextPath;