update log

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

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 			<artifactId>tools</artifactId>
 			<version>1.8</version>
 			<scope>system</scope>
-			<systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
+			<systemPath>${JAVA8_HOME}/lib/tools.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.nanohttpd</groupId> <!-- <groupId>com.nanohttpd</groupId> for 2.1.0 and earlier -->

diff --git a/src/main/java/w/core/ExecBundle.java b/src/main/java/w/core/ExecBundle.java
@@ -56,7 +56,8 @@ public synchronized static void changeBodyAndInvoke(String body) throws Exceptio
                 });
         Global.activeTransformers
                 .getOrDefault("w.Exec", new HashMap<>()).clear();
-        Swapper.getInstance().swap(message);
-        invoke();
+        if (Swapper.getInstance().swap(message)) {
+            invoke();
+        }
     }
 }
diff --git a/src/main/java/w/core/Swapper.java b/src/main/java/w/core/Swapper.java
@@ -20,7 +20,7 @@ public static Swapper getInstance() {
         return INSTANCE;
     }
 
-    public void swap(Message message) {
+    public boolean swap(Message message) {
         BaseClassTransformer transformer = null;
         try {
             switch (message.getType()) {
@@ -49,7 +49,7 @@ public void swap(Message message) {
             e.printStackTrace(pw);
             String stackTraceString = sw.toString();
             Global.error("build transform error:\n " + stackTraceString);
-            return;
+            return false;
         }
 
         Global.addTransformer(transformer);
@@ -65,8 +65,11 @@ public void swap(Message message) {
                 e.printStackTrace(pw);
                 String stackTraceString = sw.toString();
                 Global.error("re transform error:\n " + stackTraceString);
+                return false;
             }
         }
+
+        return true;
     }
 }
 

diff --git a/src/main/java/w/web/Websocketd.java b/src/main/java/w/web/Websocketd.java
@@ -10,6 +10,8 @@
 import fi.iki.elonen.NanoWSD;
 
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.UUID;
 
 /**
@@ -77,7 +79,11 @@ private void dispatch(String msg) {
                                 try {
                                     Global.deleteTransformer(UUID.fromString(deleteMessage.getUuid()));
                                 } catch (Exception e) {
-                                    Global.error(e.getMessage());
+                                    StringWriter sw = new StringWriter();
+                                    PrintWriter pw = new PrintWriter(sw);
+                                    e.printStackTrace(pw);
+                                    String stackTraceString = sw.toString();
+                                    Global.error("delete error:\n " + stackTraceString);
                                 }
                             }
                             break;
@@ -89,7 +95,11 @@ private void dispatch(String msg) {
                     e.printStackTrace();
                     Global.error("not a valid message");
                 } catch (Throwable e) {
-                    e.printStackTrace();
+                    StringWriter sw = new StringWriter();
+                    PrintWriter pw = new PrintWriter(sw);
+                    e.printStackTrace(pw);
+                    String stackTraceString = sw.toString();
+                    Global.error("error:\n " + stackTraceString);
                 } finally {
                     RequestUtils.clearRequestCtx();
                 }