Changeset f390831

Timestamp:

Apr 1, 2017 2:15:06 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

bfc0417

Parents:

5eefb8b2

Message:

Console: Fix stopping of webapps when console stops (ticket #1893)
i2psnark: Only rewrite torrent config file if changed (ticket #1893)
Util: Don't sync config writes on Android/ARM (ticket #1893)

Files:

• apps/i2psnark/java/src/org/klomp/snark/Snark.java (modified) (5 diffs)
• apps/i2psnark/java/src/org/klomp/snark/Storage.java (modified) (1 diff)
• apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java (modified) (3 diffs)
• core/java/src/net/i2p/data/DataHelper.java (modified) (3 diffs)
• history.txt (modified) (2 diffs)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

apps/i2psnark/java/src/org/klomp/snark/Snark.java

@@ -239 +239 @@
   // String indicating main activity
   private volatile String activity = "Not started";
-  private final long savedUploaded;
+  private long savedUploaded;
   private long _startedTime;
   private static final AtomicInteger __RPCID = new AtomicInteger();
@@ -638 +638 @@
         // TODO: Cache the config-in-mem to compare vs config-on-disk
         // (needed for auto-save to not double-save in some cases)
-        //boolean changed = storage.isChanged() || getUploaded() != savedUploaded;
-        boolean changed = true;
-        if (changed && completeListener != null)
-            completeListener.updateStatus(this);
+        long nowUploaded = getUploaded();
+        boolean changed = storage.isChanged() || nowUploaded != savedUploaded;
         try { 
             storage.close(); 
@@ -648 +646 @@
             ioe.printStackTrace();
         }
+        savedUploaded = nowUploaded;
+        if (changed && completeListener != null)
+            completeListener.updateStatus(this);
     }
     if (fast)
@@ -1290 +1291 @@
     allChecked = true;
     checking = false;
-    if (storage.isChanged() && completeListener != null)
+    if (storage.isChanged() && completeListener != null) {
         completeListener.updateStatus(this);
+        // this saved the status, so reset the variables
+        storage.clearChanged();
+        savedUploaded = getUploaded();
+    }
   }
   
@@ -1300 +1305 @@
     //storage.close();
     //System.out.println("Completely received: " + torrent);
-    if (completeListener != null)
+    if (completeListener != null) {
         completeListener.torrentComplete(this);
+        // this saved the status, so reset the variables
+        savedUploaded = getUploaded();
+        storage.clearChanged();
+    }
   }
 

apps/i2psnark/java/src/org/klomp/snark/Storage.java

@@ -304 +304 @@
   public boolean isChanged() {
       return changed;
+  }
+
+  /**
+   *  Clear the storage changed variable
+   *  @since 0.9.30
+   */
+  void clearChanged() {
+      changed = false;
   }
 

apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

@@ -18 +18 @@
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.SortedSet;
 import java.util.StringTokenizer;
@@ -234 +235 @@
         if (PluginStarter.pluginsEnabled(_context))
             (new I2PAppThread(new PluginStopper(_context), "PluginStopper")).start();
+        stopAllWebApps();
         try {
             _server.stop();
@@ -1041 +1043 @@
     }
 
+    /**
+     *  Stops all but the root webapp (routerconsole.war)
+     *  In Jetty 9, stopping the server doesn't stop the non-root webapps,
+     *  so we must do it here.
+     *  There should be a better way to do this, possibly by
+     *  making the webapps "managed".
+     *  @since 0.9.30
+     */
+    private void stopAllWebApps() {
+        Properties props = webAppProperties(_context);
+        Set<String> keys = props.stringPropertyNames();
+        for (String name : keys) {
+            if (name.startsWith(PREFIX) && name.endsWith(ENABLED)) {
+                String app = name.substring(PREFIX.length(), name.lastIndexOf(ENABLED));
+                if (ROUTERCONSOLE.equals(app))
+                    continue;
+                if (WebAppStarter.isWebAppRunning(app)) {
+                    try {
+                        WebAppStarter.stopWebApp(app);
+                    } catch (Throwable t) { t.printStackTrace(); }
+                }
+            }
+        }
+
+    }
+
     static class WarFilenameFilter implements FilenameFilter {
         private static final WarFilenameFilter _filter = new WarFilenameFilter();

core/java/src/net/i2p/data/DataHelper.java

@@ -47 +47 @@
 import net.i2p.util.ReusableGZIPOutputStream;
 import net.i2p.util.SecureFileOutputStream;
+import net.i2p.util.SystemVersion;
 import net.i2p.util.Translate;
 
@@ -55 +56 @@
  */
 public class DataHelper {
+
+    /** See storeProps(). 600-750 ms on RPi. */
+    private static final boolean SHOULD_SYNC = !(SystemVersion.isAndroid() || SystemVersion.isARM());
 
     /**
@@ -515 +519 @@
                 out.println(name + "=" + val);
             }
-            out.flush();
-            fos.getFD().sync();
+            if (SHOULD_SYNC) {
+                out.flush();
+                fos.getFD().sync();
+            }
             out.close();
             if (out.checkError()) {

history.txt

@@ +1 @@
+2017-04-01 zzz
+ * Console: Fix stopping of webapps when console stops (ticket #1893)
+ * i2psnark: Only rewrite torrent config file if changed (ticket #1893)
+ * KeyStoreUtil: Reduce log level of expired cert error
+ * Util: Don't sync config writes on Android/ARM (ticket #1893)
+
 2017-03-31 zzz
  * SSU:
@@ -78 +84 @@
    - Update to Jetty 9.2.21.v20170120 and Tomcat 8.0.33 (tickets #1512, #1935)
      Fixes jsp compilation on Java 9 (ticket #1870)
+     Fixes InstanceManager warning (ticket #1818)
      We now support servlet API 3.1, JSP API 2.3, and EL API 3.0.
      Breaks the following plugins: bwschedule, i2pbote, i2pcontrol, zzzot

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 13;
+    public final static long BUILD = 14;
 
     /** for example "-test" */