diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTask.java b/common/source/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTask.java index d37dc555268a7ae051eb087ea285ac2cdc5fa9b1..c8a29f7d08873ff719f396a453ba856eed1f7820 100644 --- a/common/source/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTask.java +++ b/common/source/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTask.java @@ -90,7 +90,8 @@ public final class DirectoryScanningTimerTask extends TimerTask public DirectoryScanningTimerTask(final IScannedStore scannedStore, final File sourceDirectory, final IStoreHandler storeHandler, final int ignoredErrorCount) { - this(scannedStore, new FaultyPathHandler(sourceDirectory), storeHandler, ignoredErrorCount); + this(scannedStore, new FaultyPathDirectoryScanningHandler(sourceDirectory), storeHandler, + ignoredErrorCount); } /** @@ -120,9 +121,9 @@ public final class DirectoryScanningTimerTask extends TimerTask DirectoryScanningTimerTask(final File sourceDirectory, final FileFilter fileFilter, final IPathHandler pathHandler, final int ignoredErrorCount) { - this(asScannedStore(sourceDirectory, fileFilter), new FaultyPathHandler(sourceDirectory), - PathHandlerAdapter.asScanningHandler(sourceDirectory, pathHandler), - ignoredErrorCount); + this(asScannedStore(sourceDirectory, fileFilter), new FaultyPathDirectoryScanningHandler( + sourceDirectory), PathHandlerAdapter + .asScanningHandler(sourceDirectory, pathHandler), ignoredErrorCount); } /** @@ -203,6 +204,14 @@ public final class DirectoryScanningTimerTask extends TimerTask { directoryScanningHandler.finishItemHandle(sourceDirectory, storeItem); } + } else + { + if (operationLog.isDebugEnabled()) + { + operationLog.debug(String.format( + "Following store item '%s' has NOT been handled.", storeItem)); + } + } } } catch (final Exception ex) diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/FaultyPathHandler.java b/common/source/java/ch/systemsx/cisd/common/utilities/FaultyPathDirectoryScanningHandler.java similarity index 86% rename from common/source/java/ch/systemsx/cisd/common/utilities/FaultyPathHandler.java rename to common/source/java/ch/systemsx/cisd/common/utilities/FaultyPathDirectoryScanningHandler.java index c2f9a52c19b43864e312212ca9d32ac7b1718dab..eb5f40e46c2e8f9af99a352156ebe4774916c951 100644 --- a/common/source/java/ch/systemsx/cisd/common/utilities/FaultyPathHandler.java +++ b/common/source/java/ch/systemsx/cisd/common/utilities/FaultyPathDirectoryScanningHandler.java @@ -23,6 +23,7 @@ import java.util.Set; import org.apache.log4j.Logger; import ch.systemsx.cisd.common.collections.CollectionIO; +import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.common.utilities.DirectoryScanningTimerTask.IScannedStore; @@ -36,11 +37,11 @@ import ch.systemsx.cisd.common.utilities.DirectoryScanningTimerTask.IScannedStor * * @author Christian Ribeaud */ -public final class FaultyPathHandler implements IDirectoryScanningHandler +public final class FaultyPathDirectoryScanningHandler implements IDirectoryScanningHandler { private static final Logger operationLog = - LogFactory.getLogger(LogCategory.OPERATION, FaultyPathHandler.class); + LogFactory.getLogger(LogCategory.OPERATION, FaultyPathDirectoryScanningHandler.class); private final Set<String> faultyPaths; @@ -50,7 +51,7 @@ public final class FaultyPathHandler implements IDirectoryScanningHandler static final String FAULTY_PATH_FILENAME = ".faulty_paths"; - public FaultyPathHandler(final File faultyPathDirectory) + public FaultyPathDirectoryScanningHandler(final File faultyPathDirectory) { this.faultyPaths = new HashSet<String>(); this.faultyPathsFile = new File(faultyPathDirectory, FAULTY_PATH_FILENAME); @@ -70,8 +71,9 @@ public final class FaultyPathHandler implements IDirectoryScanningHandler if (operationLog.isInfoEnabled()) { operationLog.info(String.format( - "Reread faulty paths file (%s), new set contains %d entries", - getLocationDescription(faultyPathsFile), faultyPaths.size())); + "Reread faulty paths file '%s'. New entries are '%s'.", + getLocationDescription(faultyPathsFile), CollectionUtils.abbreviate( + faultyPaths, 10))); } } } else @@ -103,6 +105,12 @@ public final class FaultyPathHandler implements IDirectoryScanningHandler private final void addToFaultyPaths(final IScannedStore scannedStore, final StoreItem item) { final String path = scannedStore.getLocationDescription(item); + if (operationLog.isDebugEnabled()) + { + operationLog.debug(String.format( + "Following path '%s' has been added to faulty paths file '%s'", path, + faultyPathsFile.getAbsolutePath())); + } faultyPaths.add(path); refreshFaultyPathsFile(); } diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTaskTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTaskTest.java index ad72e75ef7ad4097b9e151cb606840de38378c51..13233bcdcf0a9650dec7ed72eb7867ef03021abb 100644 --- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTaskTest.java +++ b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTaskTest.java @@ -113,7 +113,7 @@ public class DirectoryScanningTimerTaskTest private final File getFaultyPathFile() { - final File faultyPaths = new File(workingDirectory, FaultyPathHandler.FAULTY_PATH_FILENAME); + final File faultyPaths = new File(workingDirectory, FaultyPathDirectoryScanningHandler.FAULTY_PATH_FILENAME); return faultyPaths; }