From: <th...@us...> - 2010-08-16 20:21:06
|
Revision: 1921 http://azsmrc.svn.sourceforge.net/azsmrc/?rev=1921&view=rev Author: the8472 Date: 2010-08-16 20:21:00 +0000 (Mon, 16 Aug 2010) Log Message: ----------- new id column => new load identifier Modified Paths: -------------- mldht/branches/indexer/DHTIndexer.jar mldht/branches/indexer/lbms/plugins/mldht/indexer/MetaDataGatherer.java Modified: mldht/branches/indexer/DHTIndexer.jar =================================================================== (Binary files differ) Modified: mldht/branches/indexer/lbms/plugins/mldht/indexer/MetaDataGatherer.java =================================================================== --- mldht/branches/indexer/lbms/plugins/mldht/indexer/MetaDataGatherer.java 2010-08-16 19:21:44 UTC (rev 1920) +++ mldht/branches/indexer/lbms/plugins/mldht/indexer/MetaDataGatherer.java 2010-08-16 20:21:00 UTC (rev 1921) @@ -266,7 +266,7 @@ task.hash = new Key(entry.info_hash).toString(false);; - log("starting DHT lookup for "+entry.info_hash); + log("starting DHT lookup for "+task.hash); final AtomicInteger pendingLookups = new AtomicInteger(); @@ -275,19 +275,19 @@ int pending = pendingLookups.decrementAndGet(); PeerLookupTask pt = (PeerLookupTask) t; task.addresses.addAll(pt.getReturnedItems()); - log("one DHT lookup done for "+entry.info_hash); + log("one DHT lookup done for "+task.hash); if(pending == 0) { - log("all DHT lookups done for"+entry.info_hash); + log("all DHT lookups done for"+task.hash); activeLookups.decrementAndGet(); if(task.addresses.size() > 0) { // trim to 30 addresses to avoid 1 task being stuck for ages if(task.addresses.size() > MAX_PEERS_PER_INFOHASH) task.addresses.subList(MAX_PEERS_PER_INFOHASH, task.addresses.size()).clear(); fetchTasks.add(task); - log("added metadata task based on DHT for "+entry.info_hash); + log("added metadata task based on DHT for "+task.hash); } else { - log("found no DHT entires for "+entry.info_hash); + log("found no DHT entires for "+task.hash); torrentDone(task.entry, 0); } } @@ -304,7 +304,7 @@ lookupTask.setFastLookup(true); lookupTask.setScrapeOnly(true); lookupTask.addListener(lookupListener); - lookupTask.setInfo("Grabbing .torrent for "+entry.info_hash); + lookupTask.setInfo("Grabbing .torrent for "+task.hash); lookupTask.setNoSeeds(false); dht.getTaskManager().addTask(lookupTask); } @@ -339,10 +339,10 @@ { if(task.addresses.size() > 0) { - log("failed metadata connection and requeueing for "+task.entry.info_hash); + log("failed metadata connection and requeueing for "+task.hash); fetchMetadata(task); } else { - log("failed metadata connection and finished for "+task.entry.info_hash); + log("failed metadata connection and finished for "+task.hash); torrentDone(task.entry, 0); digestTaskQueue(); } @@ -376,12 +376,12 @@ raf.write(torrent); raf.close(); - log("successful metadata connection for "+task.entry.info_hash); + log("successful metadata connection for "+task.hash); torrentDone(task.entry, 2); } catch (IOException e) { e.printStackTrace(); - log("successful metadata connection but failed to store for "+task.entry.info_hash); + log("successful metadata connection but failed to store for "+task.hash); torrentDone(task.entry, 0); } } @@ -393,7 +393,7 @@ activeConnections.incrementAndGet(); conn.register(); - log("starting metadata connection for "+task.entry.info_hash); + log("starting metadata connection for "+task.hash); } @@ -412,7 +412,7 @@ { // handle concurrent deletes try { - session.load(entry,entry.info_hash); + session.load(entry,entry.id); } catch(ObjectNotFoundException ex) { session.save(entry); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |