Author: toad
Date: 2006-01-06 12:27:49 +0000 (Fri, 06 Jan 2006)
New Revision: 7767
Modified:
trunk/freenet/src/freenet/node/TestnetStatusUploader.java
trunk/freenet/src/freenet/node/Version.java
Log:
321: Make testnet uploader not exit on not being able to contact the target.
Modified: trunk/freenet/src/freenet/node/TestnetStatusUploader.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetStatusUploader.java 2006-01-06
00:48:21 UTC (rev 7766)
+++ trunk/freenet/src/freenet/node/TestnetStatusUploader.java 2006-01-06
12:27:49 UTC (rev 7767)
@@ -1,21 +1,10 @@
package freenet.node;
-//import java.io.BufferedReader;
import java.io.IOException;
-//import java.io.InputStream;
-//import java.io.InputStreamReader;
-//import java.io.OutputStream;
-//import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.net.Socket;
-//import java.text.DateFormat;
-//import java.text.ParseException;
-//import java.util.Date;
-//import java.util.Locale;
-//import java.util.TimeZone;
import freenet.support.Logger;
-import freenet.support.SimpleFieldSet;
/**
* Testnet StatusUploader.
@@ -53,23 +42,28 @@
private Socket client;
public void run() {
- // Set up client socket
- try
- {
//thread loop
while(true){
- client = new Socket("sleon.dyndns.org", 23415);
- PrintStream output = new
PrintStream(client.getOutputStream());
-
- output.println(node.exportFieldSet().toString());
- output.println();
- output.println(node.getIdentity());
- output.close();
+ // Set up client socket
+ try
+ {
+ client = new Socket("sleon.dyndns.org",
23415);
+ PrintStream output = new
PrintStream(client.getOutputStream());
+
+
output.println(node.exportFieldSet().toString());
+ output.println();
+ output.println(node.getIdentity());
+ output.close();
+
+ client.close();
+
+ } catch (IOException e){
+ Logger.error(this, "Could not open
connection to the uploadhost");
+ System.err.println("Could not open
connection to the uploadhost");
+ }
- client.close();
-
try{
Thread.sleep(updateInterval);
@@ -81,11 +75,6 @@
}
- }catch (IOException e){
- Logger.error(this, "Could not open connection to the
uploadhost");
- System.err.println("Could not open connection to the
uploadhost");
- return;
- }
}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-06 00:48:21 UTC (rev
7766)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-06 12:27:49 UTC (rev
7767)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 320;
+ public static final int buildNumber = 321;
/** Oldest build of Fred we will talk to */
public static final int lastGoodBuild = 318;
