igor/org.ccalm.main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exception message + exception object save to log

Browse Source
This commit is contained in:
Igor I
2025-05-20 13:03:53 +05:00
parent 3e0ba9279b
commit 9f45e71b59
10 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/main/java/org/ccalm/main/AcceptASDCController.java
View File

@ -91,7 +91,7 @@ public class AcceptASDCController implements ServletContextAware {
return hexString.toString(); return hexString.toString();
} catch (NoSuchAlgorithmException ex) { } catch (NoSuchAlgorithmException ex) {
logger.error("Error",ex); logger.error(ex.getMessage(),ex);
} }
return ""; return "";
} }
@ -207,7 +207,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return obj.toString(); return obj.toString();
} }
stmt.close(); stmt.close();
@ -222,7 +222,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -275,7 +275,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery("select 1 from main.frmlocusthealth where uid='"+uid+"'"); rs = st.executeQuery("select 1 from main.frmlocusthealth where uid='"+uid+"'");
} catch( SQLException ex ) { } catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
@ -289,7 +289,7 @@ public class AcceptASDCController implements ServletContextAware {
st.close(); st.close();
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
@ -591,7 +591,7 @@ public class AcceptASDCController implements ServletContextAware {
stmtn = new PreparedStatementNamed(conn, sql); stmtn = new PreparedStatementNamed(conn, sql);
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()+" "+sql); logRotate(data_dir+"errors.log",ex.getMessage()+" "+sql);
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
@ -807,7 +807,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.execute(); stmt.execute();
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
@ -819,7 +819,7 @@ public class AcceptASDCController implements ServletContextAware {
String tmpDir = "temp"+File.separator; String tmpDir = "temp"+File.separator;
try{ new File(dataDir+tmpDir).mkdirs(); }catch (Exception ex) { try{ new File(dataDir+tmpDir).mkdirs(); }catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
@ -881,7 +881,7 @@ public class AcceptASDCController implements ServletContextAware {
ex.printStackTrace(); ex.printStackTrace();
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return result.toString(); return result.toString();
}finally { }finally {
try{ if(conn!=null) conn.close(); }catch(Exception e){} try{ if(conn!=null) conn.close(); }catch(Exception e){}
@ -943,7 +943,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return obj.toString(); return obj.toString();
} }
try { try {
@ -952,7 +952,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return obj.toString(); return obj.toString();
} }
try { try {
@ -961,7 +961,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return obj.toString(); return obj.toString();
} }
@ -973,7 +973,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return obj.toString(); return obj.toString();
} }
@ -984,7 +984,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return obj.toString(); return obj.toString();
} }
@ -994,7 +994,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return obj.toString(); return obj.toString();
} }
@ -1009,7 +1009,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return obj.toString(); return obj.toString();
} }
if(rs!=null) if(rs!=null)
@ -1029,7 +1029,7 @@ public class AcceptASDCController implements ServletContextAware {
JSONObject obj = new JSONObject(); JSONObject obj = new JSONObject();
obj.put("error_code",1); obj.put("error_code",1);
obj.put("error_message", ex.getMessage()); obj.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return obj.toString(); return obj.toString();
} }
}else { }else {
@ -1043,7 +1043,7 @@ public class AcceptASDCController implements ServletContextAware {
ex.printStackTrace(); ex.printStackTrace();
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
return result.toString(); return result.toString();
}finally { }finally {
try{ if(conn!=null) conn.close(); }catch(Exception e){} try{ if(conn!=null) conn.close(); }catch(Exception e){}
@ -1068,7 +1068,7 @@ public class AcceptASDCController implements ServletContextAware {
String tmpDir = "temp"+File.separator; String tmpDir = "temp"+File.separator;
try{ new File(dataDir+tmpDir).mkdirs(); }catch (Exception ex) { try{ new File(dataDir+tmpDir).mkdirs(); }catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"; result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result; return result;
} }
@ -1103,14 +1103,14 @@ public class AcceptASDCController implements ServletContextAware {
stm.execute("SET timezone TO 'UTC';"); stm.execute("SET timezone TO 'UTC';");
} catch( SQLException ex ) { } catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"; result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result; return result;
} }
stm.close(); stm.close();
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"; result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result; return result;
} }
@ -1136,7 +1136,7 @@ public class AcceptASDCController implements ServletContextAware {
doc = dBuilder.parse(body); doc = dBuilder.parse(body);
} catch (Exception ex) { } catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<metadata fn=\"-1\"><![CDATA[Parsing request error!]]></metadata>"; result="<metadata fn=\"-1\"><![CDATA[Parsing request error!]]></metadata>";
return result; return result;
} }
@ -1161,7 +1161,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery("select 1 from main.frmlocust where uid='"+uid+"'"); rs = st.executeQuery("select 1 from main.frmlocust where uid='"+uid+"'");
} catch( SQLException ex ) { } catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"); result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result; return result;
} }
@ -1173,7 +1173,7 @@ public class AcceptASDCController implements ServletContextAware {
st.close(); st.close();
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"); result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result; return result;
} }
@ -1265,7 +1265,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql); stmt = conn.prepareStatement(sql);
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()+" "+sql); logRotate(data_dir+"errors.log",ex.getMessage()+" "+sql);
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"); result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result; return result;
} }
@ -1434,7 +1434,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql); stmt = conn.prepareStatement(sql);
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()+" "+sql); logRotate(data_dir+"errors.log",ex.getMessage()+" "+sql);
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"); result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result; return result;
} }
@ -1574,7 +1574,7 @@ public class AcceptASDCController implements ServletContextAware {
try{ try{
tm = new java.sql.Timestamp(dfm.parse(date).getTime()); tm = new java.sql.Timestamp(dfm.parse(date).getTime());
} catch (Exception ex) { } catch (Exception ex) {
logger.error("Error",ex.getMessage()); logger.error(ex.getMessage(), ex);
} }
stmt.setTimestamp(14, tm); stmt.setTimestamp(14, tm);
} }
@ -1690,7 +1690,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"); result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result; return result;
} }
@ -1700,7 +1700,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.execute(); stmt.execute();
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex.getMessage()); logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"); result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result; return result;
} }
@ -1751,7 +1751,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery("select 1 from main.frmlocustdel where uid=main.strtouuid('"+uid+"')"); rs = st.executeQuery("select 1 from main.frmlocustdel where uid=main.strtouuid('"+uid+"')");
} catch( SQLException ex ) { } catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex.getMessage()); logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"); result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result; return result;
} }
@ -1885,7 +1885,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql); stmt = conn.prepareStatement(sql);
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"); result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result; return result;
} }
@ -2112,7 +2112,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql); stmt = conn.prepareStatement(sql);
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"); result=("<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>");
return result; return result;
} }
@ -2277,7 +2277,7 @@ public class AcceptASDCController implements ServletContextAware {
try{ try{
tm = new java.sql.Timestamp(dfm.parse(date).getTime()); tm = new java.sql.Timestamp(dfm.parse(date).getTime());
} catch (Exception ex) { } catch (Exception ex) {
logger.error("Error",ex.getMessage()); logger.error(ex.getMessage(), ex);
} }
stmt.setTimestamp(14, tm); stmt.setTimestamp(14, tm);
} }
@ -2437,7 +2437,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"; result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result; return result;
} }
@ -2447,7 +2447,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.execute(); stmt.execute();
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"; result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
return result; return result;
} }
@ -2492,7 +2492,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) { } catch (Exception ex) {
//logRotate(data_dir+"errors.log",ex.getMessage()); //logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
}finally { }finally {
if(conn!=null){ try{ conn.close(); }catch(Exception e){} } if(conn!=null){ try{ conn.close(); }catch(Exception e){} }
} }
@ -2532,7 +2532,7 @@ public class AcceptASDCController implements ServletContextAware {
stm.close(); stm.close();
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"; result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
response.setContentType("application/xml"); response.setContentType("application/xml");
return result; return result;
@ -2589,7 +2589,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql); rs = st.executeQuery(sql);
} catch( SQLException ex ) { } catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<metadata fn=\"-1\"><![CDATA[SQL arror: "+ex.getMessage()+"]]></metadata>"; result="<metadata fn=\"-1\"><![CDATA[SQL arror: "+ex.getMessage()+"]]></metadata>";
response.setContentType("application/xml"); response.setContentType("application/xml");
return result; return result;
@ -2634,7 +2634,7 @@ public class AcceptASDCController implements ServletContextAware {
} }
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<metadata fn=\"-1\"><![CDATA[SQL arror: "+ex.getMessage()+"]]></metadata>"; result="<metadata fn=\"-1\"><![CDATA[SQL arror: "+ex.getMessage()+"]]></metadata>";
response.setContentType("application/xml"); response.setContentType("application/xml");
return result; return result;
@ -2649,7 +2649,7 @@ public class AcceptASDCController implements ServletContextAware {
String dataDir = data_dir; String dataDir = data_dir;
String tmpDir = "temp"+File.separator; String tmpDir = "temp"+File.separator;
try{ new File(dataDir+tmpDir).mkdirs(); }catch (Exception ex) { try{ new File(dataDir+tmpDir).mkdirs(); }catch (Exception ex) {
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>"; result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"-1\"><![CDATA["+ex.getMessage()+"]]></metadata>";
response.setContentType("application/xml"); response.setContentType("application/xml");
return result; return result;
@ -2676,7 +2676,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) { } catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
} }
result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"6\"><![CDATA[1]]></metadata>"; result="<?xml version=\"1.0\" encoding=\"utf-8\"?><metadata fn=\"6\"><![CDATA[1]]></metadata>";
}else }else
@ -2688,7 +2688,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) { } catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
}finally { }finally {
if(conn!=null) {try { conn.close(); } catch (SQLException e) {} } if(conn!=null) {try { conn.close(); } catch (SQLException e) {} }
} }
@ -2756,7 +2756,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql); rs = st.executeQuery(sql);
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -2785,7 +2785,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql); stmt = conn.prepareStatement(sql);
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -2814,7 +2814,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql); stmt = conn.prepareStatement(sql);
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -2830,7 +2830,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.setString(7, tbl.fields.get(0).getStrVal()); stmt.setString(7, tbl.fields.get(0).getStrVal());
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -2841,7 +2841,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.execute(); stmt.execute();
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -2849,7 +2849,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -2897,7 +2897,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql); rs = st.executeQuery(sql);
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -2944,7 +2944,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt = conn.prepareStatement(sql); stmt = conn.prepareStatement(sql);
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -3002,7 +3002,7 @@ public class AcceptASDCController implements ServletContextAware {
stmt.setString(7, tbl.fields.get(0).getStrVal());*/ stmt.setString(7, tbl.fields.get(0).getStrVal());*/
} catch (SQLException ex) { } catch (SQLException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -3015,7 +3015,7 @@ public class AcceptASDCController implements ServletContextAware {
} }
} catch (IOException ex) { } catch (IOException ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -3023,7 +3023,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
logger.error("Error:",ex); logger.error(ex.getMessage(), ex);
result.put("error_code",1); result.put("error_code",1);
result.put("error_message", ex.getMessage()); result.put("error_message", ex.getMessage());
return result.toString(); return result.toString();
@ -3108,7 +3108,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql); rs = st.executeQuery(sql);
} catch( SQLException ex ) { } catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=ex.getMessage(); result=ex.getMessage();
return result; return result;
} }
@ -3156,7 +3156,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=ex.getMessage(); result=ex.getMessage();
return result; return result;
} }
@ -3171,7 +3171,7 @@ public class AcceptASDCController implements ServletContextAware {
rs = st.executeQuery(sql); rs = st.executeQuery(sql);
} catch( SQLException ex ) { } catch( SQLException ex ) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=ex.getMessage(); result=ex.getMessage();
return result; return result;
} }
@ -3219,7 +3219,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (SQLException ex) { } catch (SQLException ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=ex.getMessage(); result=ex.getMessage();
return result; return result;
} }
@ -3228,7 +3228,7 @@ public class AcceptASDCController implements ServletContextAware {
} catch (Exception ex) { } catch (Exception ex) {
logRotate(data_dir+"errors.log",ex.getMessage()); logRotate(data_dir+"errors.log",ex.getMessage());
logger.error("error",ex); logger.error(ex.getMessage(), ex);
}finally{ }finally{
if(conn!=null){ try{ conn.close(); }catch(Exception e){} } if(conn!=null){ try{ conn.close(); }catch(Exception e){} }
} }
@ -3283,7 +3283,7 @@ public class AcceptASDCController implements ServletContextAware {
}catch(Exception ex) }catch(Exception ex)
{ {
System.out.println(ex.getMessage()); System.out.println(ex.getMessage());
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
result=false; result=false;
} }
return result; return result;
@ -3308,7 +3308,7 @@ public class AcceptASDCController implements ServletContextAware {
writer.newLine(); writer.newLine();
writer.close(); writer.close();
} catch (IOException ex) { } catch (IOException ex) {
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
} }
} }
} }

11
src/main/java/org/ccalm/main/AcceptJSON.java
View File

@ -45,6 +45,7 @@ import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.slf4j.MarkerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
@ -2324,15 +2325,15 @@ public class AcceptJSON implements ServletContextAware {
} }
} }
} catch (CustomException e) { } catch (CustomException ex) {
if(e.isSaveToLog()){ if(ex.isSaveToLog()){
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
logger.error(uuid,e); logger.error(MarkerFactory.getMarker(uuid),ex.getMessage(),ex);
} }
json = e.getJson(); json = e.getJson();
} catch (Exception e) { } catch (Exception ex) {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
logger.error(uuid,e); logger.error(MarkerFactory.getMarker(uuid),ex.getMessage(), ex);
json = LTools.createJSONError(10000,"Internal_Server_Error", (String)null, uuid); json = LTools.createJSONError(10000,"Internal_Server_Error", (String)null, uuid);
} }
return json.toString(); return json.toString();

2
src/main/java/org/ccalm/main/MainController.java
View File

@ -160,7 +160,7 @@ public class MainController implements ServletContextAware {
} }
} catch( DataAccessException ex ) } catch( DataAccessException ex )
{ {
logger.error("Error",ex); logger.error(ex.getMessage(), ex);
} }
result.put("Error_code", "0"); result.put("Error_code", "0");

9
src/main/java/org/ccalm/main/SendWarning.java
View File

@ -3,6 +3,7 @@ package org.ccalm.main;
import jakarta.servlet.ServletContext; import jakarta.servlet.ServletContext;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.slf4j.MarkerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*; import org.springframework.http.*;
@ -71,9 +72,9 @@ public class SendWarning {
result.put("value", value); result.put("value", value);
} }
} }
} catch (Exception e) { } catch (Exception ex) {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
logger.error(uuid,e); logger.error(MarkerFactory.getMarker(uuid),ex.getMessage(), ex);
} }
return result; return result;
} }
@ -167,9 +168,9 @@ public class SendWarning {
} }
} }
} }
} catch (Exception e) { } catch (Exception ex) {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
logger.error(uuid,e); logger.error(MarkerFactory.getMarker(uuid),ex.getMessage(), ex);
} }
return new ResponseEntity<>(result, HttpStatus.OK); return new ResponseEntity<>(result, HttpStatus.OK);
} }

2
src/main/java/org/ccalm/main/UpdateLocust.java
View File

@ -309,7 +309,7 @@ public class UpdateLocust {
try{ try{
tm = new java.sql.Timestamp(dfm.parse(locust.date).getTime()); tm = new java.sql.Timestamp(dfm.parse(locust.date).getTime());
} catch (Exception ex) { } catch (Exception ex) {
logger.error("Error",ex.getMessage()); logger.error(ex.getMessage(), ex);
} }
parameters.addValue("date", locust.date, Types.DATE); parameters.addValue("date", locust.date, Types.DATE);
} }

4
src/main/java/org/ccalm/main/engine/EngineController.java
View File

@ -72,8 +72,8 @@ public class EngineController implements ServletContextAware {
KeyFactory keyFactory = KeyFactory.getInstance("RSA"); KeyFactory keyFactory = KeyFactory.getInstance("RSA");
PublicKey key = keyFactory.generatePublic(spec); PublicKey key = keyFactory.generatePublic(spec);
return key; return key;
} catch (Exception e) { } catch (Exception ex) {
logger.error(e); logger.error(ex.getMessage(), ex);
} }
return null; return null;
} }

3
src/main/java/org/ccalm/main/login/LoginController.java
View File

@ -7,6 +7,7 @@ import jakarta.servlet.ServletContext;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.ccalm.main.engine.EngineController; import org.ccalm.main.engine.EngineController;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.MarkerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@ -63,7 +64,7 @@ public class LoginController implements ServletContextAware {
} }
} catch (Exception ex) { } catch (Exception ex) {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
logger.error(uuid, ex); logger.error(MarkerFactory.getMarker(uuid), ex.getMessage(), ex);
} }
return "login/login"; return "login/login";

4
src/main/java/org/ccalm/main/utils/CustomException.java
View File

@ -66,8 +66,8 @@ public class CustomException extends Exception {
json.put("error_message", this.getErrorMessages()); json.put("error_message", this.getErrorMessages());
json.put("error_setting", this.getErrorSettings()); json.put("error_setting", this.getErrorSettings());
json.put("error_marker", this.getErrorMarker()); json.put("error_marker", this.getErrorMarker());
} catch (JSONException e) { } catch (JSONException ex) {
logger.error("Error", e); logger.error(ex.getMessage(), ex);
} }
return json; return json;
} }

4
src/main/java/org/ccalm/main/utils/LTools.java
View File

@ -28,8 +28,8 @@ public class LTools {
json.put("error_message", Arrays.asList(message)); json.put("error_message", Arrays.asList(message));
json.put("error_setting", Arrays.asList(setting)); json.put("error_setting", Arrays.asList(setting));
json.put("error_marker", marker); json.put("error_marker", marker);
} catch (JSONException e) { } catch (JSONException ex) {
logger.error(e); logger.error(ex.getMessage(), ex);
} }
return json; return json;
} }

2
src/main/java/tools/PreparedStatementNamed.java
View File

@ -194,7 +194,7 @@ public class PreparedStatementNamed {
try{ try{
tm = new java.sql.Timestamp(dfm.parse(value).getTime()); tm = new java.sql.Timestamp(dfm.parse(value).getTime());
} catch (Exception ex) { } catch (Exception ex) {
logger.error("Error",ex.getMessage()); logger.error(ex.getMessage(), ex);
} }
for (int i = 0; i < fields.size(); i++) { for (int i = 0; i < fields.size(); i++) {
if (fields.get(i).name.equals(name)) { if (fields.get(i).name.equals(name)) {