Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[2529] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback
|
From: <bra...@us...> - 2008-08-08 23:03:43
|
Revision: 2529
http://archive-access.svn.sourceforge.net/archive-access/?rev=2529&view=rev
Author: bradtofel
Date: 2008-08-08 23:03:50 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
TWEAK: improvements to logging.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexQueueUpdater.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/ResourceFileLocationDBUpdater.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileSourceUpdater.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java 2008-08-08 23:02:29 UTC (rev 2528)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java 2008-08-08 23:03:50 UTC (rev 2529)
@@ -304,7 +304,7 @@
sleepInterval = runInterval;
}
} catch (InterruptedException e) {
- e.printStackTrace();
+ LOGGER.info("Shutting Down.");
return;
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexQueueUpdater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexQueueUpdater.java 2008-08-08 23:02:29 UTC (rev 2528)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexQueueUpdater.java 2008-08-08 23:03:50 UTC (rev 2529)
@@ -87,7 +87,9 @@
CloseableIterator<String> newNames =
db.getNamesBetweenMarks(lastMarkPoint, currentMarkPoint);
while(newNames.hasNext()) {
- queue.enqueue(newNames.next());
+ String newName = newNames.next();
+ LOGGER.info("Queued " + newName + " for indexing.");
+ queue.enqueue(newName);
added++;
}
newNames.close();
@@ -143,15 +145,13 @@
int updated = updater.updateQueue();
if(updated > 0) {
- LOGGER.info("Updated " + updated + " files..");
sleepInterval = runInterval;
} else {
- LOGGER.info("Updated ZERO files..");
sleepInterval += runInterval;
}
sleep(sleepInterval);
} catch (InterruptedException e) {
- e.printStackTrace();
+ LOGGER.info("Shutting Down.");
return;
} catch (IOException e) {
e.printStackTrace();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java 2008-08-08 23:02:29 UTC (rev 2528)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java 2008-08-08 23:03:50 UTC (rev 2529)
@@ -103,6 +103,7 @@
try {
if(pathsOrUrls != null) {
for(String pathOrUrl : pathsOrUrls) {
+ LOGGER.info("Indexing " + name + " from " + pathOrUrl);
CloseableIterator<CaptureSearchResult> itr = indexFile(pathOrUrl);
target.addSearchResults(name, itr);
itr.close();
@@ -151,17 +152,15 @@
boolean worked = worker.doWork();
if(worked) {
- LOGGER.info("Did work, no sleep..");
sleepInterval = 0;
} else {
- LOGGER.info("No Work to do - sleeping..");
sleepInterval += runInterval;
}
if(sleepInterval > 0) {
sleep(sleepInterval);
}
} catch (InterruptedException e) {
- e.printStackTrace();
+ LOGGER.info("Shutting Down.");
return;
} catch (IOException e) {
e.printStackTrace();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/ResourceFileLocationDBUpdater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/ResourceFileLocationDBUpdater.java 2008-08-08 23:02:29 UTC (rev 2528)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/ResourceFileLocationDBUpdater.java 2008-08-08 23:03:50 UTC (rev 2529)
@@ -168,7 +168,7 @@
}
sleep(sleepInterval);
} catch (InterruptedException e) {
- e.printStackTrace();
+ LOGGER.info("Shutting Down.");
return;
} catch (IOException e) {
e.printStackTrace();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileSourceUpdater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileSourceUpdater.java 2008-08-08 23:02:29 UTC (rev 2528)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileSourceUpdater.java 2008-08-08 23:03:50 UTC (rev 2529)
@@ -125,7 +125,7 @@
". Not sleeping.");
}
} catch (InterruptedException e) {
- e.printStackTrace();
+ LOGGER.info("Shutting Down.");
return;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
