Changeset 4f14677


Ignore:
Timestamp:
Jan 12, 2013 6:18:17 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
dcd655f, f57f49c3
Parents:
083dffe
Message:
  • I2CP: Failsafe check for delivery job requeueing forever (ticket #819)
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    r083dffe r4f14677  
     12013-01-12 zzz
     2 * EepGet: Don't retry if proxy isn't there
     3 * I2CP: Failsafe check for delivery job requeueing forever (ticket #819)
     4 * jobs.jsp: Add table of pending jobs
     5 * NetDB: Split up files into subdirectories
     6 * SAM: Force i2cp.messageReliability=None (ticket #819)
     7
    182013-01-02 zzz
    29 * DataHelper: new getASCII() method
     
    714   - Remove unused equals() methods for message classes
    815   - Remove static logs
    9    - Fix leak if nonce = 0 but reliability != none
     16   - Fix leak if nonce = 0 but reliability != none (ticket #819)
    1017   - More work on failure codes (ticket #788)
    1118 * Logs: Fix setting log filename (ticket #805)
  • router/java/src/net/i2p/router/RouterVersion.java

    r083dffe r4f14677  
    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/client/ClientConnectionRunner.java

    r083dffe r4f14677  
    629629     */
    630630    private final static long REQUEUE_DELAY = 500;
     631    private static final int MAX_REQUEUE = 60;  // 30 sec.
    631632   
    632633    private class MessageDeliveryStatusUpdate extends JobImpl {
     
    634635        private final int _status;
    635636        private long _lastTried;
     637        private int _requeueCount;
    636638
    637639        /**
     
    663665
    664666            if (!alreadyAccepted(_messageId)) {
    665                 _log.warn("Almost send an update for message " + _messageId + " to "
     667                if (_requeueCount++ > MAX_REQUEUE) {
     668                    // bug requeueing forever? failsafe
     669                    _log.error("Abandon update for message " + _messageId + " to "
    666670                          + MessageStatusMessage.getStatusString(msg.getStatus())
    667                           + " for session " + _sessionId.getSessionId()
     671                          + " for session " + _sessionId.getSessionId());
     672                } else {
     673                    if (_log.shouldLog(Log.WARN))
     674                        _log.warn("Almost send an update for message " + _messageId + " to "
     675                          + MessageStatusMessage.getStatusString(msg.getStatus())
     676                          + " for session " + _sessionId.getSessionId()
    668677                          + " before they knew the messageId!  delaying .5s");
    669                 _lastTried = _context.clock().now();
    670                 requeue(REQUEUE_DELAY);
     678                    _lastTried = _context.clock().now();
     679                    requeue(REQUEUE_DELAY);
     680                }
    671681                return;
    672682            }
Note: See TracChangeset for help on using the changeset viewer.