more log

sunwu51 · Feb 18, 2024 · b2a7bc5 · b2a7bc5
1 parent e07f17d
commit b2a7bc5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 40 deletions.
diff --git a/src/main/java/w/Global.java b/src/main/java/w/Global.java
@@ -149,6 +149,19 @@ public static void error(Object content) {
         log(2, "" + content);
     }
 
+    /**
+     * Print error log, and broadcast to all websocket client
+     * @param content
+     * @param e
+     */
+    public static void error(Object content, Throwable e) {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        e.printStackTrace(pw);
+        String stackTraceString = sw.toString();
+        log(2, content + "\n" + stackTraceString);
+    }
+
     /**
      * To pretty string, by m3.prettyobjct.*
      * @param obj
@@ -174,11 +187,7 @@ public static String toJson(Object obj) throws JsonProcessingException {
         try {
             return PrintUtils.getObjectMapper().writeValueAsString(obj);
         } catch (Exception e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            String stackTraceString = sw.toString();
-            Global.error("re transform error:\n " + stackTraceString);
+            Global.error("re transform error:", e);
             return "toJson error";
         }
     }
@@ -229,11 +238,7 @@ public static synchronized void deleteTransformer(UUID uuid) {
                     try {
                         instrumentation.retransformClasses(aClass);
                     } catch (UnmodifiableClassException e) {
-                        StringWriter sw = new StringWriter();
-                        PrintWriter pw = new PrintWriter(sw);
-                        e.printStackTrace(pw);
-                        String stackTraceString = sw.toString();
-                        Global.error("re transform error:\n " + stackTraceString);
+                        Global.error("re transform error:", e);
                     }
                 }
                 return true;
@@ -275,11 +280,7 @@ public static synchronized void reset() {
                 try {
                     instrumentation.retransformClasses(aClass);
                 } catch (Exception e) {
-                    StringWriter sw = new StringWriter();
-                    PrintWriter pw = new PrintWriter(sw);
-                    e.printStackTrace(pw);
-                    String stackTraceString = sw.toString();
-                    Global.error("reset re transform error:\n " + stackTraceString);
+                    Global.error("reset re transform error: ", e);
                 }
             }
 

diff --git a/src/main/java/w/core/Swapper.java b/src/main/java/w/core/Swapper.java
@@ -44,11 +44,7 @@ public boolean swap(Message message) {
                     throw new RuntimeException("message type not support");
             }
         } catch (Throwable e) {
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            String stackTraceString = sw.toString();
-            Global.error("build transform error:\n " + stackTraceString);
+            Global.error("build transform error:", e);
             return false;
         }
 
@@ -60,11 +56,7 @@ public boolean swap(Message message) {
             try {
                 Global.addActiveTransformer(aClass, transformer);
             } catch (Throwable e) {
-                StringWriter sw = new StringWriter();
-                PrintWriter pw = new PrintWriter(sw);
-                e.printStackTrace(pw);
-                String stackTraceString = sw.toString();
-                Global.error("re transform error:\n " + stackTraceString);
+                Global.error("re transform error:", e);
                 return false;
             }
         }

diff --git a/src/main/java/w/core/model/BaseClassTransformer.java b/src/main/java/w/core/model/BaseClassTransformer.java
@@ -44,11 +44,7 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
                 Global.info(className + " re transform by " + uuid +  " success <(^－^)>");
                 return r;
             } catch (Exception e) {
-                StringWriter sw = new StringWriter();
-                PrintWriter pw = new PrintWriter(sw);
-                e.printStackTrace(pw);
-                String stackTraceString = sw.toString();
-                Global.error(className + " re transform fail by " + uuid + " -(′д｀)-: \n " + stackTraceString);
+                Global.error(className + " re transform fail by " + uuid + " -(′д｀)-: ", e);
             }
         }
         return null;

diff --git a/src/main/java/w/web/Websocketd.java b/src/main/java/w/web/Websocketd.java
@@ -79,11 +79,7 @@ private void dispatch(String msg) {
                                 try {
                                     Global.deleteTransformer(UUID.fromString(deleteMessage.getUuid()));
                                 } catch (Exception e) {
-                                    StringWriter sw = new StringWriter();
-                                    PrintWriter pw = new PrintWriter(sw);
-                                    e.printStackTrace(pw);
-                                    String stackTraceString = sw.toString();
-                                    Global.error("delete error:\n " + stackTraceString);
+                                    Global.error("delete error:", e);
                                 }
                             }
                             break;
@@ -95,11 +91,7 @@ private void dispatch(String msg) {
                     e.printStackTrace();
                     Global.error("not a valid message");
                 } catch (Throwable e) {
-                    StringWriter sw = new StringWriter();
-                    PrintWriter pw = new PrintWriter(sw);
-                    e.printStackTrace(pw);
-                    String stackTraceString = sw.toString();
-                    Global.error("error:\n " + stackTraceString);
+                    Global.error("error:", e);
                 } finally {
                     RequestUtils.clearRequestCtx();
                 }