gfwleak/nms-oam
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chenjinsong
2018-10-11 20:06:03 +08:00
parent e7d19d4381
commit 68315d7a6a
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gloam/conf/log4j.properties
View File

@@ -3,11 +3,11 @@ log4j.rootLogger=DEBUG, stdout, file
log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout 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=%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 # Output to the File
#log4j.appender.file=org.apache.log4j.DailyRollingFileAppender log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
#log4j.appender.file.DatePattern='_'yyyy-MM-dd'.log' log4j.appender.file.DatePattern='_'yyyy-MM-dd'.log'
#log4j.appender.file.File=./jfinal_demo.log log4j.appender.file.File=./jfinal_demo.log
#log4j.appender.file.layout=org.apache.log4j.PatternLayout 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 log4j.appender.file.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}-[%p]-(%F:%L) [%t] : %m%n

3
gloam/src/com/nis/gloam/controller/ConfigController.java
View File

@@ -64,6 +64,9 @@ public class ConfigController extends Controller {
try { try {
List remoteExec = LinuxUtil.remoteExec(ip, user, pwd, remoteCommand); List remoteExec = LinuxUtil.remoteExec(ip, user, pwd, remoteCommand);
String execResult = remoteExec.get(0).toString(); String execResult = remoteExec.get(0).toString();
if (StrKit.isBlank(execResult)) {
throw new JSchException("无响应内容");
}
result.put("in", execResult); result.put("in", execResult);
result.put("exitStatus", remoteExec.get(1)); result.put("exitStatus", remoteExec.get(1));
} catch (JSchException e) { } catch (JSchException e) {

10
gloam/src/com/nis/gloam/interceptor/OperateLogInterceptor.java
View File

@@ -2,6 +2,8 @@ package com.nis.gloam.interceptor;
import java.util.List; import java.util.List;
import org.apache.log4j.Logger;
import com.jfinal.aop.Interceptor; import com.jfinal.aop.Interceptor;
import com.jfinal.aop.Invocation; import com.jfinal.aop.Invocation;
import com.nis.gloam.entity.SysMenu; import com.nis.gloam.entity.SysMenu;
@@ -12,7 +14,8 @@ import com.nis.gloam.util.LogUtil;
* *
*/ */
public class OperateLogInterceptor implements Interceptor{ public class OperateLogInterceptor implements Interceptor{
private Logger logger = Logger.getLogger(OperateLogInterceptor.class);
@Override @Override
public void intercept(Invocation inv) { public void intercept(Invocation inv) {
try { try {
@@ -26,13 +29,14 @@ public class OperateLogInterceptor implements Interceptor{
inv.getController().removeSessionAttr("loginUser"); inv.getController().removeSessionAttr("loginUser");
} }
} catch (Exception e) { } 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()); List<SysMenu> find = SysMenu.dao.find("select * from sys_menu where href=? and target=1",inv.getActionKey());
if(find!=null&&find.size()>0){ if(find!=null&&find.size()>0){
LogUtil.queryRequestInfo(inv,e); LogUtil.queryRequestInfo(inv,e);
} }
inv.getController().setSessionAttr("errorMessage", "handle.error"); inv.getController().setSessionAttr("errorMessage", "handle.error");
inv.getController().redirect(inv.getControllerKey()); //inv.getController().redirect(inv.getControllerKey());
inv.getController().render("/error/500.jsp");
} }
} }