Changeset 1b42d99


Ignore:
Timestamp:
Jul 21, 2013 2:04:27 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2313d82
Parents:
d709f46
Message:
  • Console: Fix /peers table summary alignment
  • I2CP:
    • Don't NPE when loglevel=warn
    • Don't enforce property length limits when inside router JVM
  • I2PSnark: Log uncaught error in ThreadedStarter? to router log
  • I2PThread: Log uncaught error to wrapper log
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

    rd709f46 r1b42d99  
    18641864        public ThreadedStarter(Snark s) { snark = s; }
    18651865        public void run() {
     1866            try {
     1867                run2();
     1868            } catch (Exception e) {
     1869                _log.error("Error starting", e);
     1870            }
     1871        }
     1872
     1873        private void run2() {
    18661874            if (snark != null) {
    18671875                if (snark.isStopped())
  • core/java/src/net/i2p/client/I2PSessionImpl.java

    rd709f46 r1b42d99  
    310310            }
    311311            String val = options.getProperty(key);
    312             if ((key.length() > 255) || (val.length() > 255)) {
     312            // not serializing (no limit) in router ctx
     313            // fixme, bytes could still be over 255 (unlikely)
     314            if ((!_context.isRouterContext()) &&
     315                (key.length() > 255 || val.length() > 255)) {
    313316                if (_log.shouldLog(Log.WARN))
    314                     _log.warn(getPrefix() + "Not passing on property ["
     317                    _log.warn("Not passing on property ["
    315318                              + key
    316                               + "] in the session configuration as the value is too long (max = 255): "
     319                              + "] in the session config, key or value is too long (max = 255): "
    317320                              + val);
    318321            } else {
  • core/java/src/net/i2p/util/I2PThread.java

    rd709f46 r1b42d99  
    9393            }
    9494          ****/
    95             if (t instanceof OutOfMemoryError)
     95            if (t instanceof OutOfMemoryError) {
    9696                fireOOM((OutOfMemoryError)t);
     97            } else {
     98                System.out.println ("Thread terminated unexpectedly: " + getName());
     99                t.printStackTrace();
     100            }
    97101        }
    98102        // This creates a new I2PAppContext after it was deleted
  • history.txt

    rd709f46 r1b42d99  
     12012-07-21 zzz
     2 * I2CP:
     3   - Don't NPE when loglevel=warn
     4   - Don't enforce property length limits when inside router JVM
     5 * I2PSnark: Log uncaught error in ThreadedStarter to router log
     6 * I2PThread: Log uncaught error to wrapper log
     7
    182012-07-20 zzz
    29 Prop from i2p.i2p.zzz.ipv6:
  • router/java/src/net/i2p/router/RouterVersion.java

    rd709f46 r1b42d99  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 4;
     21    public final static long BUILD = 5;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

    rd709f46 r1b42d99  
    11741174        if (!peers.isEmpty()) {
    11751175//            buf.append("<tr> <td colspan=\"11\"><hr></td></tr>\n");
    1176             buf.append("<tr class=\"tablefooter\"><td align=\"center\"><b>")
    1177                .append(ngettext("{0} peer", "{0} peers", peers.size()))
    1178                .append("</b></td><td>&nbsp;</td><td>&nbsp;");
    1179             buf.append("</td><td align=\"center\"><b>").append(formatRate(bpsRecv/1024)).append(THINSP).append(formatRate(bpsSend/1024)).append("</b>");
     1176            buf.append("<tr class=\"tablefooter\"><td colspan=\"4\" align=\"left\"><b>")
     1177               .append(ngettext("{0} peer", "{0} peers", peers.size()));
     1178            buf.append("</b></td><td align=\"center\"><b>").append(formatRate(bpsRecv/1024)).append(THINSP).append(formatRate(bpsSend/1024)).append("</b>");
    11801179            buf.append("</td><td align=\"center\"><b>").append(DataHelper.formatDuration2(totalUptime/peers.size()));
    11811180            buf.append("</b></td><td align=\"center\"><b>").append(DataHelper.formatDuration2(offsetTotal*1000/peers.size()));
  • router/java/src/net/i2p/router/transport/udp/UDPTransport.java

    rd709f46 r1b42d99  
    27182718      if (numPeers > 0) {
    27192719//        buf.append("<tr><td colspan=\"16\"><hr></td></tr>\n");
    2720         buf.append("<tr class=\"tablefooter\"><td colspan=\"3\" align=\"left\"><b>")
     2720        buf.append("<tr class=\"tablefooter\"><td colspan=\"4\" align=\"left\"><b>")
    27212721           .append(ngettext("{0} peer", "{0} peers", peers.size()))
    27222722           .append("</b></td>" +
Note: See TracChangeset for help on using the changeset viewer.