removal of FileChecker #1

icatproject · Dec 18, 2023 · eb14fa9 · eb14fa9
1 parent dd04954
commit eb14fa9
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 840 deletions.
diff --git a/src/main/config/logback.xml.example b/src/main/config/logback.xml.example
@@ -23,6 +23,4 @@
 		<appender-ref ref="FILE" />
 	</root>
 
-	<logger name="org.icatproject.ids.FileChecker" level="INFO" />
-
 </configuration>
diff --git a/src/main/config/run.properties.example b/src/main/config/run.properties.example
@@ -30,12 +30,6 @@ storageUnit = dataset
 tidyBlockSize = 500
 !enableWrite = true
 
-# File checking properties.  Deprecated
-!filesCheck.parallelCount = 5
-!filesCheck.gapSeconds = 5
-!filesCheck.lastIdFile = ${HOME}/ids/lastIdFile
-!filesCheck.errorLog = ${HOME}/ids/errorLog
-
 # Link properties.  Deprecated
 !linkLifetimeSeconds = 3600
 

diff --git a/src/main/java/org/icatproject/ids/FileChecker.java b/src/main/java/org/icatproject/ids/FileChecker.java
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -23,6 +23,4 @@
 		<appender-ref ref="FILE" />
 	</root>
 
-	<logger name="org.icatproject.ids.FileChecker" level="INFO" />
-
 </configuration>
diff --git a/src/main/scripts/setup b/src/main/scripts/setup
@@ -40,19 +40,6 @@ if arg == "INSTALL":
             if not (idsProperties.get("delayDatafileOperationsSeconds")):
                 abort("delayDatafileOperationsSeconds is not set in run.properties")
 
-    if int(idsProperties.get("filesCheck.parallelCount", 0)) > 0:
-        warnings.warn("The FileChecker is deprecated and slated for removal in ids.server 3.0")
-        if not idsProperties.get("filesCheck.gapSeconds"): abort("filesCheck.gapSeconds is not set in run.properties")
-        if not idsProperties.get("filesCheck.lastIdFile"): abort("filesCheck.lastIdFile is not set in run.properties")
-        parent = os.path.dirname(os.path.expandvars(idsProperties["filesCheck.lastIdFile"]))
-        if not os.path.exists(parent):
-            abort("Please create directory " + parent + " for filesCheck.lastIdFile specified in run.properties")
-        if not idsProperties.get("filesCheck.errorLog"): abort("filesCheck.errorLog is not set in run.properties")
-        parent = os.path.dirname(os.path.expandvars(idsProperties["filesCheck.errorLog"]))
-        if not os.path.exists(parent):
-            abort("Please create directory " + parent + " for filesCheck.errorLog specified in run.properties")
-        if not idsProperties.get("reader"): abort("reader is not set in run.properties")
-
     if int(idsProperties.get("linkLifetimeSeconds", 0)) > 0:
         warnings.warn("The getLink API call is deprecated and slated for removal in ids.server 3.0")