[commit] #1061 zombie threads is killed

Author: magiclu550

JPLS/src/main/java/cn/jsmod2/Register.java

@@ -213,7 +213,10 @@ public void registerPacket(){
     /**
      * 运行jsmod2时的jvm参数，只有在启动启动器(rpc调用)时，才会生效
      */
-    public static final String JSMOD2_JVM_ARGS = "jsmod2.jvm.args";
+    public static final String JSMOD2_JVM_ARGS = "jsmod2.option";
+
+
+
 
     /**
      * 当开启成功时的信息

JPLS/src/main/java/cn/jsmod2/core/Console.java

@@ -11,6 +11,7 @@
 
 import cn.jsmod2.core.ex.ServerRuntimeException;
 import cn.jsmod2.core.interapi.command.INativeCommand;
+import cn.jsmod2.core.log.ServerLogger;
 import cn.jsmod2.core.script.EmeraldScriptVM;
 import cn.jsmod2.core.script.EnvPage;
 import cn.jsmod2.core.script.Memory;
@@ -61,6 +62,10 @@ public void commandInput() throws IOException{
         }
         PrintWriter stream = new PrintWriter(new FileOutputStream(outFile,true));
         while (true){
+            if(!Server.getSender().getServer().isConnected){
+                ServerLogger.getLogger().multiInfo(getClass(),"Exit the command input thread...","","");
+                break;
+            }
             //@Deprecated
             String command;
             if(Server.getSender().getServer().serverProp.getProperty(FileSystem.CONSOLE_LINE,"false").equals("false")) {

JPLS/src/main/java/cn/jsmod2/core/Server.java

@@ -560,6 +560,7 @@ private void closeStream(){
     }
 
     private void closeAll(){
+        isConnected = false;
         scheduler.getPool().shutdownNow();
         disable();
         closeStream();
@@ -662,6 +663,9 @@ public void run() {
                 //在未来版本可能会加入支持多个smod2连接一个服务器
                 serverSocket = getSocket(Integer.parseInt(serverProp.getProperty(FileSystem.THIS_PORT)));
                 while (true) {
+                    if(!Server.getSender().getServer().isConnected){
+                        ServerLogger.getLogger().multiInfo(getClass(),"the listener thread is closed","","");
+                    }
                     DatagramPacket request = new DatagramPacket(new byte[MAX_LENGTH], MAX_LENGTH);
                     ((DatagramSocket)serverSocket).receive(request);
                     //manageMessage(request);
@@ -689,6 +693,9 @@ public void run() {
                 }
 
                 while (true) {
+                    if(!Server.getSender().getServer().isConnected){
+                        ServerLogger.getLogger().multiInfo(getClass(),"the listener thread is closed","","");
+                    }
                     Socket socket = ((ServerSocket)serverSocket).accept();
                     scheduler.executeRunnable(new SocketHandlerThread(socket));
                     if (isDebug) {
@@ -792,6 +799,9 @@ public void run() {
             try {
                 int count = 0;
                 while (shouldIRun) {
+                    if(!Server.getSender().getServer().isConnected){
+                        ServerLogger.getLogger().multiInfo(getClass(),"the listener thread is closed","","");
+                    }
                     Thread.sleep(crunchifyRunEveryNSeconds);
 
                     String log = logListener(timeFormat,max,fileProperty);

jsmod2/src/main/java/cn/jsmod2/api/event/admin/IAdminQueryEvent.java

@@ -6,33 +6,39 @@
 /**
  *
  *
+ * 在管理员查询服务器时，会触发该事件
+ * 如管理员在游戏中查询服务器玩家等，或者需要添加的过程
  * Called when an cn.jsmod2.admin queries the cn.jsmod2.server.
- * @author YorokobiMaster #(doc)
  * @author magiclu550
+ * @see cn.jsmod2.core.interapi.event.IEvent
+ * @since smod2 3.4.0-3.5.0
  *
  */
 public interface IAdminQueryEvent extends IEvent {
 
     /**
+     * 获得此时管理员的对象
      * @return The cn.jsmod2.player who queried the cn.jsmod2.server
      */
     IPlayer getAdmin();
 
     /**
+     * 设置此时的管理员对象
      * Set the cn.jsmod2.player who queried the cn.jsmod2.server
      * @param admin cn.jsmod2.admin
      */
     void setAdmin(IPlayer admin);
 
 
     /**
-     *
+     * 获得查询内容
      * @return The query
      *
      */
     String getQuery();
 
     /**
+     * 设置查询内容
      * Set the query
      * @param query The query
      */
@@ -41,22 +47,27 @@ public interface IAdminQueryEvent extends IEvent {
 
 
     /**
+     * 获得查询后的输出内容
      * @return The output of the query
      */
     String getOutput();
 
     /**
-     * Set the query
+     * 设置输出内容
+     * Set the output of the query
      * @param output the output of the query
      */
     void setOutput(String output);
 
     /**
+     * 是否处理了查询内容，如果处理了，返回true，如果没有处理
+     * 返回false
      * @return Was the query handled?
      */
     boolean isHandled();
 
     /**
+     * 设置处理是否成功，如果想使得其不成功，则设置为false
      * Set the handled
      * @param handled Was the query handled?
      */
@@ -65,12 +76,13 @@ public interface IAdminQueryEvent extends IEvent {
 
 
     /**
-     *
+     *获得查询是否成功，如果不成功，返回false
      * @return Was the query successful?
      */
     boolean isSuccessful();
 
     /**
+     * 设置查询不成功，则设置false
      * Set the query successful;
      * @param successful set query successful
      */

jsmod2/src/main/java/cn/jsmod2/api/event/admin/IAuthCheckEvent.java

@@ -4,22 +4,59 @@
 import cn.jsmod2.api.server.AuthType;
 import cn.jsmod2.core.interapi.event.IEvent;
 
+/**
+ * Called when authentication is checked for.
+ * @author magiclu550
+ * @see cn.jsmod2.core.interapi.event.IEvent
+ * @since smod2 3.4.0 - 3.5.0
+ */
 public interface IAuthCheckEvent extends IEvent {
 
+    /**
+     * @return The player who requests authentication
+     */
     IPlayer getRequester();
 
+    /**
+     * @return The type of authentication.
+     */
+
     AuthType getType();
 
+    /**
+     * Set the type of authentication.
+      * @param type
+     */
     void setType(AuthType type);
 
+    /**
+     * @return Was the authentication allowed?
+     */
     boolean isAllow();
 
+    /**
+     * Set the authentication allowed.
+     * @param allow the allowed
+     */
     void setAllow(boolean allow);
 
+    /**
+     *
+     * @return The message given if authentication was denied
+     */
     String getDeniedMessage();
 
+
+    /**
+     * The message given if authentication was denied
+     * @param message the denied message
+     */
     void setDeniedMessage(String message);
 
+    /**
+     * The player who requests authentication
+     * @param requester the requester
+     */
     void setRequester(IPlayer requester);
 
 }

jsmod2/src/main/java/cn/jsmod2/api/event/admin/IBanEvent.java

@@ -3,28 +3,73 @@
 import cn.jsmod2.api.player.IPlayer;
 import cn.jsmod2.core.interapi.event.IEvent;
 
+/**
+ *
+ * Called when a player is banned
+ * @author magiclu550
+ * @see cn.jsmod2.core.interapi.event.IEvent
+ * @since smod2 3.4.0 - 3.5.0
+ */
 public interface IBanEvent extends IEvent {
 
-
+    /**
+     * @return The player who is banned
+     */
     IPlayer getPlayer();
 
+    /**
+     * The object can be null if the event is not raised from the player, but from a plugin or console
+     * @return The admin who bans the player
+     */
     IPlayer getAdmin();
 
+    /**
+     * @return The duration of the ban
+     */
     int getDuration();
 
+    /**
+     * Set the duration of the ban
+     * @param duration the duration of the ban
+     */
     void setDuration(int duration);
 
+    /**
+     * @return The reason of the ban
+     */
     String getReason();
 
+    /**
+     * Set the reason of the ban
+     * @param reason the reason the ban
+     */
     void setReason(String reason);
 
+    /**
+     * @return The result of the ban
+     */
     String getResult();
 
+    /**
+     * Set the result of the ban
+     * @param result the result of the ban
+     */
     void setResult(String result);
 
+    /**
+     * @return Was the ban allowed?
+     */
     boolean isAllowBan();
 
+    /**
+     * Set the ban allowed
+     * @param allowBan the ban is allowed or not
+     */
     void setAllowBan(boolean allowBan);
 
+    /**
+     * Set the admin who bans the player
+     * @param admin the admin
+     */
     void setAdmin(IPlayer admin);
 }