From a5839b91b7c4bb28d2d3a89e8dbe6783a7e8aad5 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 23 Jul 2008 14:18:23 +0000
Subject: [PATCH] change: move constant to DatamoverConstants
SVN: 7443
---
.../cisd/datamover/DatamoverConstants.java | 3 +++
.../utils/QuietPeriodFileFilter.java | 19 +++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DatamoverConstants.java b/datamover/source/java/ch/systemsx/cisd/datamover/DatamoverConstants.java
index 9b3d917b508..0e4c0a840bd 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DatamoverConstants.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DatamoverConstants.java
@@ -28,4 +28,7 @@ public class DatamoverConstants
public static final String RSYNC_PASSWORD_FILE_INCOMING = "etc/rsync_incoming.passwd";
public static final String RSYNC_PASSWORD_FILE_OUTGOING = "etc/rsync_outgoing.passwd";
+
+ public static final int IGNORED_ERROR_COUNT_BEFORE_NOTIFICATION = 3;
+
}
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/utils/QuietPeriodFileFilter.java b/datamover/source/java/ch/systemsx/cisd/datamover/utils/QuietPeriodFileFilter.java
index e551b54854a..c11b1dc93b0 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/utils/QuietPeriodFileFilter.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/utils/QuietPeriodFileFilter.java
@@ -33,6 +33,7 @@ import ch.systemsx.cisd.common.logging.LogLevel;
import ch.systemsx.cisd.common.utilities.ITimeProvider;
import ch.systemsx.cisd.common.utilities.StoreItem;
import ch.systemsx.cisd.common.utilities.SystemTimeProvider;
+import ch.systemsx.cisd.datamover.DatamoverConstants;
import ch.systemsx.cisd.datamover.filesystem.intf.IFileStore;
import ch.systemsx.cisd.datamover.intf.ITimingParameters;
@@ -51,8 +52,6 @@ import ch.systemsx.cisd.datamover.intf.ITimingParameters;
*/
public class QuietPeriodFileFilter implements IStoreItemFilter
{
- private static final int IGNORED_ERROR_COUNT_BEFORE_NOTIFICATION = 3;
-
@Private
static final int CLEANUP_TO_QUIET_PERIOD_RATIO = 10;
@@ -67,12 +66,12 @@ public class QuietPeriodFileFilter implements IStoreItemFilter
private final static Logger machineLog =
LogFactory.getLogger(LogCategory.MACHINE, QuietPeriodFileFilter.class);
- private final static Logger notifyLog =
+ private final static Logger notificationLog =
LogFactory.getLogger(LogCategory.NOTIFY, QuietPeriodFileFilter.class);
- private final ConditionalNotificationLogger conditionalNotifyLog =
- new ConditionalNotificationLogger(machineLog, notifyLog,
- IGNORED_ERROR_COUNT_BEFORE_NOTIFICATION);
+ private final ConditionalNotificationLogger conditionalNotificationLog =
+ new ConditionalNotificationLogger(machineLog, notificationLog,
+ DatamoverConstants.IGNORED_ERROR_COUNT_BEFORE_NOTIFICATION);
private final long quietPeriodMillis;
@@ -173,13 +172,13 @@ public class QuietPeriodFileFilter implements IStoreItemFilter
final StatusWithResult<Long> status = fileStore.lastChanged(item, oldLastChanged);
if (status.isError())
{
- conditionalNotifyLog.log(LogLevel.ERROR, String.format(
+ conditionalNotificationLog.log(LogLevel.ERROR, String.format(
"Cannot obtain \"last changed\" status of item '%s' in store '%s': %s",
item, fileStore, status.tryGetErrorMessage()));
return false;
} else
{
- conditionalNotifyLog.reset(null);
+ conditionalNotificationLog.reset(null);
}
final long newLastChanged = status.tryGetResult();
if (newLastChanged != oldLastChanged)
@@ -219,10 +218,10 @@ public class QuietPeriodFileFilter implements IStoreItemFilter
if (status.isError() == false)
{
pathMap.put(item, new PathCheckRecord(now, status.tryGetResult()));
- conditionalNotifyLog.reset(null);
+ conditionalNotificationLog.reset(null);
} else
{
- conditionalNotifyLog.log(LogLevel.ERROR, String.format(
+ conditionalNotificationLog.log(LogLevel.ERROR, String.format(
"Cannot obtain \"last changed\" status of item '%s' in store '%s': %s",
item, fileStore, status.tryGetErrorMessage()));
}
--
GitLab