echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blocklist: Read feed file before user-specified file

Browse Source
This commit is contained in:
zzz
2016-11-27 15:58:57 +00:00
parent 850f1504f7
commit 25fd488db0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
router/java/src/net/i2p/router/Blocklist.java
View File

@ -116,6 +116,7 @@ public class Blocklist {
* Loads the following files in-order:
* $I2P/blocklist.txt
* ~/.i2p/blocklist.txt
* ~/.i2p/docs/feed/blocklist/blocklist.txt
* File if specified with router.blocklist.file
*/
public void startup() {
@ -131,6 +132,7 @@ public class Blocklist {
blFile = new File(_context.getConfigDir(), BLOCKLIST_FILE_DEFAULT);
files.add(blFile);
}
files.add(_blocklistFeedFile);
// user specified
String file = _context.getProperty(PROP_BLOCKLIST_FILE);
if (file != null && !file.equals(BLOCKLIST_FILE_DEFAULT)) {
@ -139,7 +141,6 @@ public class Blocklist {
blFile = new File(_context.getConfigDir(), file);
files.add(blFile);
}
files.add(_blocklistFeedFile);
Job job = new ReadinJob(files);
job.getTiming().setStartAfter(_context.clock().now() + 30*1000);
_context.jobQueue().addJob(job);