1.解决程序出错时无限重定向的问题；2.优化日志结构；3.系统配置：脚本未找到或无返回内容时在日志中提示错误

3 files changed, 16 insertions, 9 deletions

diff --git a/gloam/conf/log4j.properties b/gloam/conf/log4j.properties
index b58d6a9..c69ebb2 100644
--- a/gloam/conf/log4j.properties
+++ b/gloam/conf/log4j.properties
@@ -3,11 +3,11 @@ log4j.rootLogger=DEBUG, stdout, file
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 #log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n
-log4j.appender.stdout.layout.ConversionPattern=%d %p (%F:%L) [%t] - <%m>%n
+log4j.appender.stdout.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}-[%p]-(%F:%L) [%t] : %m%n
 
 # Output to the File
-#log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.file.DatePattern='_'yyyy-MM-dd'.log'
-#log4j.appender.file.File=./jfinal_demo.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n
\ No newline at end of file
+log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.file.DatePattern='_'yyyy-MM-dd'.log'
+log4j.appender.file.File=./jfinal_demo.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}-[%p]-(%F:%L) [%t] : %m%n
\ No newline at end of file
diff --git a/gloam/src/com/nis/gloam/controller/ConfigController.java b/gloam/src/com/nis/gloam/controller/ConfigController.java
index 7bf3db9..aa8da67 100644
--- a/gloam/src/com/nis/gloam/controller/ConfigController.java
+++ b/gloam/src/com/nis/gloam/controller/ConfigController.java
@@ -64,6 +64,9 @@ public class ConfigController extends Controller {
 					try {
 						List remoteExec = LinuxUtil.remoteExec(ip, user, pwd, remoteCommand);
 						String execResult = remoteExec.get(0).toString();
+						if (StrKit.isBlank(execResult)) {
+							throw new JSchException("无响应内容");
+						}
 						result.put("in", execResult);
 						result.put("exitStatus", remoteExec.get(1));
 					} catch (JSchException e) {
diff --git a/gloam/src/com/nis/gloam/interceptor/OperateLogInterceptor.java b/gloam/src/com/nis/gloam/interceptor/OperateLogInterceptor.java
index 227a5e4..0721238 100644
--- a/gloam/src/com/nis/gloam/interceptor/OperateLogInterceptor.java
+++ b/gloam/src/com/nis/gloam/interceptor/OperateLogInterceptor.java
@@ -2,6 +2,8 @@ package com.nis.gloam.interceptor;
 
 import java.util.List;
 
+import org.apache.log4j.Logger;
+
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.nis.gloam.entity.SysMenu;
@@ -12,7 +14,8 @@ import com.nis.gloam.util.LogUtil;
  *
  */
 public class OperateLogInterceptor implements Interceptor{
-
+	private Logger logger = Logger.getLogger(OperateLogInterceptor.class);
+	
 	@Override
 	public void intercept(Invocation inv) {
 		try {
@@ -26,13 +29,14 @@ public class OperateLogInterceptor implements Interceptor{
 				inv.getController().removeSessionAttr("loginUser");
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error(e, e);
 			List<SysMenu> find = SysMenu.dao.find("select * from sys_menu where href=? and target=1",inv.getActionKey());
 			if(find!=null&&find.size()>0){
 				LogUtil.queryRequestInfo(inv,e);
 			}
 			inv.getController().setSessionAttr("errorMessage", "handle.error");
-			inv.getController().redirect(inv.getControllerKey());
+			//inv.getController().redirect(inv.getControllerKey());
+			inv.getController().render("/error/500.jsp");
 		}
 	}