Changeset 176

Timestamp:

02/26/06 15:36:02 (2 years ago)

Author:

dsandler

Message:

Integrate Pastry logging with FeedTree logging levels, in service of the
following tickets:

• #37 couldn't create node factory
  
• #40 problems joining the network ("Could not dispatch message ...")
  

There's now quite a bit of spaghetti in WebProxyClient.main() to do
this; perhaps the log configuration stuff should be factored into a separate
function for readability.

Additionally, the proxy now supports the -L (--logfile) flag, to
specify a file where all log messages should be written. This necessitated a
new LogHandler for the FeedTree logging, and as a result FeedTree logs
now go to System.out by default (instead of System.err). This closes ticket
#42.

Files:

• feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java (modified) (5 diffs)

feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java

@@ -1362 +1362 @@
-        boolean serveFeedsOnly = false;
-
+        PrintStream logStream = System.out;
+
-        List accessRules = new ArrayList();
-
@@ -1376 +1378 @@
-                } catch (UnknownHostException exc) {
-                    System.out.println("error: address could not be resolved: " + hostSpec);
+                    System.exit(1);
+                }
+            } else if (args[i].equals("--logfile") || args[i].equals("-L")) {
+                try {
+                    logStream = new PrintStream(
+                            new FileOutputStream(args[++i], true /*append*/));
+                    logStream.print(
+                            "=== Logging started " + new Date().toString() + " ===\n\n");
+                } catch (Exception exc) {
+                    System.out.println("error: could not write to logfile: " + exc.toString());
-                    System.exit(1);
-                }
@@ -1437 +1449 @@
-                System.out.println("usage: java -jar ftproxy.jar [flags]\n\n"
-                    + "flags:\n\n"
+                    + "  -L/--logfile <file>\n"
+                    + "       rediret all proxy output (see -v and -V flags) to\n"
+                    + "       the specified file"
-                    + "  -g/--public\n"
-                    + "       allow HTTP connections from any host\n"
@@ -1535 +1550 @@
-        // We have to turn on log messages first thing, or we won't see 
-        // anything on stdout
-.global.setLevel(loggingLevel
-Logger.getLogger("")
+ masterLogger = Logger.getLogger(""
+masterLogger
-        for(int i=0; i<handlers.length; i++) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        // Synchronize Pastry's logging situation with our own.
+        rice.environment.params.Parameters pastryParams = 
+            new rice.environment.params.simple.SimpleParameters(
+                rice.environment.Environment.defaultParamFileArray, null);
-        rice.environment.Environment pastryEnv 
-
+
+
+
+
+
+
+
+
+
-        Client.setPastryEnvironment(pastryEnv);
-        int pastryLogLevel;
@@ -1564 +1612 @@
-        }
-        pastryEnv.getParameters().setInt("loglevel", pastryLogLevel);
-
+
-        // Let's start talking to the user.
-        Logger.global.info("Version: "