From daf32a24bc5b9aa571a2c19c66ae900baaeb88ca Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Thu, 6 Jan 2005 20:59:13 +0000
Subject: [PATCH] * 2005-01-06  0.4.2.6 released 2005-01-06  jrandom     *
 Added a startup message to the addressbook, printing its version number      
 to stdout (which is sent to wrapper.config) when it loads.     * Updated the
 addressbook to reread the config file periodically     * Added orion.i2p to
 the list of eepsites on the default homepage

---
 .../java/src/addressbook/Daemon.java          | 29 +++++++++++--------
 .../java/src/addressbook/Servlet.java         |  2 ++
 history.txt                                   | 10 ++++++-
 installer/install.xml                         |  2 +-
 readme.html                                   |  1 +
 .../src/net/i2p/router/RouterVersion.java     |  6 ++--
 6 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/apps/addressbook/java/src/addressbook/Daemon.java b/apps/addressbook/java/src/addressbook/Daemon.java
index 77784a16d..e01048998 100644
--- a/apps/addressbook/java/src/addressbook/Daemon.java
+++ b/apps/addressbook/java/src/addressbook/Daemon.java
@@ -35,7 +35,8 @@ import java.io.File;
  *
  */
 public class Daemon {
-
+    public static final String VERSION = "2.0.3";
+    
     /**
      * Update the router and published address books using remote data from the
      * subscribed address books listed in subscriptions.
@@ -144,18 +145,22 @@ public class Daemon {
             else
                 System.out.println("ERROR: Addressbook directory " + homeFile.getName() + " could not be created");
         }
-        settings = ConfigParser.parse(new File(homeFile, settingsLocation), defaultSettings);
-
-        System.setProperty("proxySet", "true");
-        System.setProperty("http.proxyHost", (String) settings
-                .get("proxy_host"));
-        System.setProperty("http.proxyPort", (String) settings
-                .get("proxy_port"));
-        long delay = Long.parseLong((String) settings.get("update_delay"));
-        if (delay < 1) {
-            delay = 1;
-        }
+        
+        File settingsFile = new File(homeFile, settingsLocation);
+        
         while (true) {
+            settings = ConfigParser.parse(settingsFile, defaultSettings);
+
+            System.setProperty("proxySet", "true");
+            System.setProperty("http.proxyHost", (String) settings
+                    .get("proxy_host"));
+            System.setProperty("http.proxyPort", (String) settings
+                    .get("proxy_port"));
+            long delay = Long.parseLong((String) settings.get("update_delay"));
+            if (delay < 1) {
+                delay = 1;
+            }
+            
             Daemon.update(settings, home);
             try {
                 Thread.sleep(delay * 60 * 60 * 1000);
diff --git a/apps/addressbook/java/src/addressbook/Servlet.java b/apps/addressbook/java/src/addressbook/Servlet.java
index a1077e876..1fa9dee15 100644
--- a/apps/addressbook/java/src/addressbook/Servlet.java
+++ b/apps/addressbook/java/src/addressbook/Servlet.java
@@ -54,6 +54,8 @@ public class Servlet extends GenericServlet {
         DaemonThread thread = new DaemonThread(args);
         thread.setDaemon(true);
         thread.start();
+        System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
+        System.out.println("INFO: config root under " + args[0]);
     }
 
 }
\ No newline at end of file
diff --git a/history.txt b/history.txt
index 48638b4c9..e9ee4a2c5 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,12 @@
-$Id: history.txt,v 1.124 2004/12/31 19:57:01 jrandom Exp $
+$Id: history.txt,v 1.125 2005/01/05 19:17:53 jrandom Exp $
+
+* 2005-01-06  0.4.2.6 released
+
+2005-01-06  jrandom
+    * Added a startup message to the addressbook, printing its version number
+      to stdout (which is sent to wrapper.config) when it loads.
+    * Updated the addressbook to reread the config file periodically
+    * Added orion.i2p to the list of eepsites on the default homepage
 
 2005-01-05  jrandom
     * Handle unexpected network read errors more carefully (thanks parg!)
diff --git a/installer/install.xml b/installer/install.xml
index 066b6e0db..78650f17c 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.4.2.5</appversion>
+        <appversion>0.4.2.6</appversion>
         <authors>
             <author name="I2P" email="support@i2p.net"/>
         </authors>
diff --git a/readme.html b/readme.html
index 499892edb..15c6c01c6 100644
--- a/readme.html
+++ b/readme.html
@@ -16,6 +16,7 @@ listed (if not, <a href="#trouble">see below</a>).  Once those are up, you can:<
      <ul>
          <li><a href="http://duck.i2p/">duck.i2p</a>: duck's eepsite, with links to other active sites</li>
          <li><a href="http://ugha.i2p/">ugha.i2p</a>: ugha's eepsite, a wiki that anyone can edit, and lots of links</li>
+         <li><a href="http://orion.i2p/">orion.i2p</a>: a site which tracks eepsite uptime and changes</li>
          <li><a href="http://files.i2p/">files.i2p</a>: a search engine that tries to keep track of things on I2P</li>
          <li><a href="http://forum.i2p/">forum.i2p</a>: a secure and anonymous connection to <a href="http://forum.i2p.net/">forum.i2p.net</a></li>
          <li><a href="http://www.i2p/">www.i2p</a>: a secure and anonymous connection to <a href="http://www.i2p.net/">www.i2p.net</a></li>
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 328e7bdbf..7306db684 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.129 $ $Date: 2004/12/31 19:57:01 $";
-    public final static String VERSION = "0.4.2.5";
-    public final static long BUILD = 7;
+    public final static String ID = "$Revision: 1.130 $ $Date: 2005/01/05 19:17:54 $";
+    public final static String VERSION = "0.4.2.6";
+    public final static long BUILD = 0;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);