Update of /cvsroot/freenet/freenet/src/freenet/node/http
In directory sc8-pr-cvs1:/tmp/cvs-serv17951/src/freenet/node/http

Modified Files:
        BookmarkManagerServlet.java DistributionServlet.java 
        NodeInfoServlet.java 
Log Message:
6195: (mostly) asynchronous trailer writing, lots of logging improvements (most code 
supports selective logging now), bugfixes


Index: BookmarkManagerServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/BookmarkManagerServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BookmarkManagerServlet.java 30 Aug 2003 23:16:52 -0000      1.12
+++ BookmarkManagerServlet.java 18 Sep 2003 17:48:09 -0000      1.13
@@ -114,7 +114,7 @@
         bookmarks = loadDefaultBookmarks();
         thisPath = "/servlet/bookmarkmanager";
         pendingNewBookmark = null;
-        logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+        logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
         try {
             pageTemplate = 
HtmlTemplate.createTemplate("BookmarkManagerServletTmpl.html");
         } catch (IOException ioe) {
@@ -189,7 +189,7 @@
      * @return success/fail message 
      */
     private String addBookmark(String key, String title, String description, String 
activelinkFile) {
-        logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+        logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
         if (!allowUpdatingBookmarks) {
             return "Bookmarks cannot be updated on public nodes";
         } 
@@ -211,7 +211,7 @@
      * @return success/fail message 
      */
     private String confirmAddBookmark(long secret) {
-        logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+        logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
         if (!allowUpdatingBookmarks) {
             return "Bookmarks cannot be updated on public nodes";
         } 
@@ -233,7 +233,7 @@
      * @return success/fail message
      */
     private String removeBookmark(int num, String key) {
-        logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+        logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
         if (!allowUpdatingBookmarks) {
             return "Bookmarks cannot be updated on public nodes";
         } 
@@ -264,7 +264,7 @@
      * @return success/fail message
      */
     private String updateBookmark(int num, String key, String newKey, String 
newTitle, String newDesc, String newActivelinkFile) {
-        logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+        logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
         if (!allowUpdatingBookmarks) {
             return "Bookmarks cannot be updated on public nodes";
         } 
@@ -714,7 +714,7 @@
      *             a.b.c.d and a.b.c.e, fs will contain d and e)
      */
     public void configPropertyUpdated(String path, Params fs) {
-        logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+        logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
        if(logDEBUG)
            Core.logger.log(this, "configPropertyUpdated called w/ path [" + 
                            path + "]", Logger.DEBUG);

Index: DistributionServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/DistributionServlet.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- DistributionServlet.java    15 Aug 2003 02:50:27 -0000      1.58
+++ DistributionServlet.java    18 Sep 2003 17:48:09 -0000      1.59
@@ -75,7 +75,7 @@
     private HtmlTemplate pageTmp, titleBoxTmp;
     
     public void init() throws ServletException {
-       logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+       logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
        Core.logger.log(this, "init()", Logger.DEBUG);
        try {
            synchronized(staticSync) {

Index: NodeInfoServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/NodeInfoServlet.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- NodeInfoServlet.java        23 Jul 2003 15:46:15 -0000      1.45
+++ NodeInfoServlet.java        18 Sep 2003 17:48:10 -0000      1.46
@@ -102,9 +102,9 @@
       registerInfolet(internal, new TickerContents());
       registerInfolet(internal, new FailureTableInfolet());
       registerInfolet(internal, new EnvironmentInfolet());
-      if(!Main.publicNode) {
-         registerInfolet(internal, new RTInfolet());
-      }
+//       if(!Main.publicNode) {
+//       registerInfolet(internal, new RTInfolet());
+//       }
       Group docs = new Group("Documentation", "documentation");
       registerGroup(docs);
       // REDUNDANT    registerInfolet(internal, new ThreadFactoryInfolet());

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to