From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/log/LogHelper.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/log/LogHelper.java b/fanli/src/main/java/com/yeshi/fanli/log/LogHelper.java
index 6ea645e..675ff4c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/log/LogHelper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/log/LogHelper.java
@@ -2,14 +2,13 @@
import java.io.File;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
@@ -92,41 +91,49 @@
loginLogger.info(obj);
}
- public static void errorDetailInfo(Throwable e) throws Exception {
+ public static void errorDetailInfo(Throwable e) {
e.printStackTrace();
String date = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy_MM_dd");
String os = System.getProperty("os.name");
- String filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.txt", date);
+ String filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.log", date);
if (os.toLowerCase().startsWith("win")) {
- filePath = String.format("C:/logs/error_detail_%s.txt", date);
+ filePath = String.format("C:/logs/error_detail_%s.log", date);
} else
- filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.txt", date);
+ filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.log", date);
- OutputStream out = new FileOutputStream(new File(filePath), true);
+ OutputStream out = null;
+
try {
+ out = new FileOutputStream(new File(filePath), true);
PrintStream ps = new PrintStream(out);
ps.print(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
ps.print("\n");
e.printStackTrace(ps);
ps.flush();
ps.close();
+ } catch (Exception ee) {
+
} finally {
- out.close();
+ try {
+ out.close();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
}
- public static void errorDetailInfo(Throwable e, String params, String url) throws Exception {
+ public static void errorDetailInfo(Throwable e, String params, String url) {
e.printStackTrace();
String date = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy_MM_dd");
String os = System.getProperty("os.name");
- String filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.txt", date);
+ String filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.log", date);
if (os.toLowerCase().startsWith("win")) {
- filePath = String.format("C:/logs/error_detail_%s.txt", date);
+ filePath = String.format("C:/logs/error_detail_%s.log", date);
} else
- filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.txt", date);
-
- OutputStream out = new FileOutputStream(new File(filePath), true);
+ filePath = String.format("/usr/local/tomcat8/logs/error_detail_%s.log", date);
+ OutputStream out = null;
try {
+ out = new FileOutputStream(new File(filePath), true);
PrintStream ps = new PrintStream(out);
ps.print(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
ps.print("\n");
@@ -137,8 +144,14 @@
e.printStackTrace(ps);
ps.flush();
ps.close();
+ } catch (Exception e1) {
+
} finally {
- out.close();
+ try {
+ out.close();
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
}
--
Gitblit v1.8.0