Changeset 16 for src/main/java/geniusweb/partiesserver/RunningPartiesUpdater.java

Timestamp:

06/22/20 16:08:10 (4 years ago)

Author:

bart

Message:

Tries harder to kill parties after deadline

File:

• src/main/java/geniusweb/partiesserver/RunningPartiesUpdater.java (modified) (5 diffs)

src/main/java/geniusweb/partiesserver/RunningPartiesUpdater.java

@@ -12 +12 @@
  * 
  * This object keeps the {@link RunningPartiesRepo} up to date. Main job is to
- * remove parties that have been timed out. When a party times out,
- * it calls {@link Party#terminate()} but that might fail to stop a party. 
- * In the end, the protocol should close the connection after the deadline. Start and run only once.
+ * remove parties that have been timed out. When a party times out, it calls
+ * {@link Party#terminate()} but that might fail to stop a party. In the end,
+ * the protocol should close the connection after the deadline. Start and run
+ * only once.
  */
 public class RunningPartiesUpdater implements Runnable {
@@ -23 +24 @@
          * when a negotiation runs out of time, the protocol may want to inform all
          * parties about the failed session. If the parties are all killed at that
-         * moment, this is impossible. Therefore we wait KILL_DELAY extra time before
-         * really killing the parties.
+         * moment, this is impossible. Therefore we wait KILL_DELAY extra time
+         * before really killing the parties.
          */
         private static final long KILL_DELAY = 2000;
@@ -31 +32 @@
          * @param repo   the {@link RunningPartiesRepo} that must be updated
          *               automatically
-         * @param period the period with which to check time-out (ms). Recommended 1000.
-         *               After constructing you can run this in separate thread or just
-         *               call {@link #run()}
+         * @param period the period with which to check time-out (ms). Recommended
+         *               1000. After constructing you can run this in separate
+         *               thread or just call {@link #run()}
          * 
          */
@@ -53 +54 @@
                         }
                 } catch (InterruptedException e) {
-                        System.err.println("ERROR:  RunningPartiesUpdater was interrupted!");
+                        System.err
+                                        .println("ERROR:  RunningPartiesUpdater was interrupted!");
                 }
         }
 
         /**
-         * Called when some file that may be relevant has changed. Synchronized to avoid
-         * weird states if filesystem changes rapidly. We ignore everything but jar
-         * files.
+         * Removes parties when they ran out of time. Called when some file that may
+         * be relevant has changed, and periodically every {@link #period}.
+         * Synchronized to avoid weird states if filesystem changes rapidly. We
+         * ignore everything but jar files.
          */
         void update() {
@@ -66 +69 @@
                         long now = System.currentTimeMillis();
                         if (now >= party.getEndDate().getTime() + KILL_DELAY) {
+                                log.log(Level.WARNING,
+                                                "party " + party.getID() + " still running "
+                                                                + KILL_DELAY / 1000
+                                                                + "s after deadline. Removed now.");
                                 running.remove(party.getID());
-                                log.log(Level.WARNING, "party " + party.getID() + " still running 2s after deadline. Removed now.");
+                                try {
+                                        Thread.sleep(20);
+                                } catch (InterruptedException e) {
+                                }
                         }
                 }