2005-11-24 jrandom

* Fix to save syndication settings in Syndie (thanks spaetz!)
This commit is contained in:
jrandom
2005-11-24 08:45:54 +00:00
committed by zzz
parent 2b841ad667
commit dbb4b3d0c2
4 changed files with 31 additions and 17 deletions

View File

@ -973,6 +973,7 @@ public class BlogManager {
if ( (location != null) && (location.trim().length() > 0) ) if ( (location != null) && (location.trim().length() > 0) )
buf.append(location.trim()); buf.append(location.trim());
System.setProperty("syndie.updateArchives", buf.toString()); System.setProperty("syndie.updateArchives", buf.toString());
writeConfig();
Updater.wakeup(); Updater.wakeup();
} }
public void scheduleSyndication(String locations[]) { public void scheduleSyndication(String locations[]) {
@ -987,6 +988,7 @@ public class BlogManager {
for (Iterator iter = locs.iterator(); iter.hasNext(); ) for (Iterator iter = locs.iterator(); iter.hasNext(); )
buf.append(iter.next().toString().trim()).append(','); buf.append(iter.next().toString().trim()).append(',');
System.setProperty("syndie.updateArchives", buf.toString()); System.setProperty("syndie.updateArchives", buf.toString());
writeConfig();
Updater.wakeup(); Updater.wakeup();
} }
public void unscheduleSyndication(String location) { public void unscheduleSyndication(String location) {
@ -998,6 +1000,7 @@ public class BlogManager {
buf.append(archives[i]).append(","); buf.append(archives[i]).append(",");
System.setProperty("syndie.updateArchives", buf.toString()); System.setProperty("syndie.updateArchives", buf.toString());
} }
writeConfig();
} }
public boolean syndicationScheduled(String location) { public boolean syndicationScheduled(String location) {
String archives[] = getUpdateArchives(); String archives[] = getUpdateArchives();

View File

@ -1,4 +1,7 @@
$Id: history.txt,v 1.326 2005/11/21 09:37:10 jrandom Exp $ $Id: history.txt,v 1.327 2005/11/23 11:04:56 jrandom Exp $
2005-11-24 jrandom
* Fix to save syndication settings in Syndie (thanks spaetz!)
2005-11-23 jrandom 2005-11-23 jrandom
* Removed spurious streaming lib RTO increase (it wasn't helpful) * Removed spurious streaming lib RTO increase (it wasn't helpful)

View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.294 $ $Date: 2005/11/21 09:37:09 $"; public final static String ID = "$Revision: 1.295 $ $Date: 2005/11/23 11:04:56 $";
public final static String VERSION = "0.6.1.5"; public final static String VERSION = "0.6.1.5";
public final static long BUILD = 5; public final static long BUILD = 6;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);

View File

@ -56,25 +56,33 @@ public class InboundMessageState {
StringBuffer buf = new StringBuffer(1024); StringBuffer buf = new StringBuffer(1024);
buf.append("Invalid fragment ").append(fragmentNum); buf.append("Invalid fragment ").append(fragmentNum);
buf.append(": ").append(data); buf.append(": ").append(data);
data.toRawString(buf); //data.toRawString(buf);
_log.log(Log.CRIT, buf.toString(), new Exception("source")); _log.error(buf.toString());
return false; return false;
} }
if (_fragments[fragmentNum] == null) { if (_fragments[fragmentNum] == null) {
// new fragment, read it // new fragment, read it
ByteArray message = _fragmentCache.acquire(); ByteArray message = _fragmentCache.acquire();
data.readMessageFragment(dataFragment, message.getData(), 0); try {
int size = data.readMessageFragmentSize(dataFragment); data.readMessageFragment(dataFragment, message.getData(), 0);
message.setValid(size); int size = data.readMessageFragmentSize(dataFragment);
_fragments[fragmentNum] = message; message.setValid(size);
boolean isLast = data.readMessageIsLast(dataFragment); _fragments[fragmentNum] = message;
if (isLast) boolean isLast = data.readMessageIsLast(dataFragment);
_lastFragment = fragmentNum; if (isLast)
if (_log.shouldLog(Log.DEBUG)) _lastFragment = fragmentNum;
_log.debug("New fragment " + fragmentNum + " for message " + _messageId if (_log.shouldLog(Log.DEBUG))
+ ", size=" + size _log.debug("New fragment " + fragmentNum + " for message " + _messageId
+ ", isLast=" + isLast + ", size=" + size
+ ", data=" + Base64.encode(message.getData(), 0, size)); + ", isLast=" + isLast
+ ", data=" + Base64.encode(message.getData(), 0, size));
} catch (ArrayIndexOutOfBoundsException aioobe) {
StringBuffer buf = new StringBuffer(1024);
buf.append("Corrupt SSU fragment ").append(fragmentNum);
buf.append(": ").append(data);
_log.error(buf.toString(), aioobe);
return false;
}
} else { } else {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Received fragment " + fragmentNum + " for message " + _messageId _log.debug("Received fragment " + fragmentNum + " for message " + _messageId