Don't mark ignored files as completed, just ignore them
This commit is contained in:
parent
23f08ec9dc
commit
fc56013305
1 changed files with 7 additions and 15 deletions
|
@ -39,7 +39,7 @@ class VesselThread(Process):
|
||||||
time.sleep(5)
|
time.sleep(5)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self._logger.error("An exception occurred in the Vessel Thread for " +
|
self._logger.error("An exception occurred in the Vessel Thread for " +
|
||||||
self.vessel.name)
|
self.vessel.name)
|
||||||
self._logger.error(repr(e))
|
self._logger.error(repr(e))
|
||||||
|
|
||||||
@retry()
|
@retry()
|
||||||
|
@ -88,18 +88,6 @@ class VesselThread(Process):
|
||||||
else:
|
else:
|
||||||
fileobj = current
|
fileobj = current
|
||||||
|
|
||||||
if fileobj.directory.name in self.vessel._ignoredirs:
|
|
||||||
self._logger.debug(
|
|
||||||
f"Not replicating Directory {fileobj.directory.name} to Vessel {self.vessel.name} - marking complete")
|
|
||||||
|
|
||||||
db = Database()
|
|
||||||
db.logCompletion(fileobj, self.vessel)
|
|
||||||
del(db)
|
|
||||||
|
|
||||||
self.vessel._uploaded.append(fileobj.uuid)
|
|
||||||
self.checkFileCompletion(fileobj)
|
|
||||||
return
|
|
||||||
|
|
||||||
remotefile = RemoteFile(fileobj, self.vessel,
|
remotefile = RemoteFile(fileobj, self.vessel,
|
||||||
self._state["config"].chunksize)
|
self._state["config"].chunksize)
|
||||||
|
|
||||||
|
@ -173,12 +161,16 @@ class VesselThread(Process):
|
||||||
self._logger.debug(
|
self._logger.debug(
|
||||||
f"Trying to fetch new file for vessel {self.vessel.name} from queue")
|
f"Trying to fetch new file for vessel {self.vessel.name} from queue")
|
||||||
for f in self._state["files"]:
|
for f in self._state["files"]:
|
||||||
if not f.uuid in self.vessel._uploaded:
|
if (not (f.uuid in self.vessel._uploaded)) and (not (f.directory.name in self.vessel._ignoredirs)):
|
||||||
self._logger.debug(
|
self._logger.debug(
|
||||||
f"Using file {f.name} for vessel {self.vessel.name}")
|
f"Using file {f.name} for vessel {self.vessel.name}")
|
||||||
return f
|
return f
|
||||||
|
if f.uuid in self.vessel._uploaded:
|
||||||
|
reason = "already uploaded"
|
||||||
|
else:
|
||||||
|
reason = "Directory ignored"
|
||||||
self._logger.debug(
|
self._logger.debug(
|
||||||
f"Disregarding file {f.name} for vessel {self.vessel.name} - already uploaded")
|
f"Disregarding file {f.name} for vessel {self.vessel.name} - {reason}")
|
||||||
|
|
||||||
self._logger.debug(
|
self._logger.debug(
|
||||||
f"Didn't find any new files for vessel {self.vessel.name}")
|
f"Didn't find any new files for vessel {self.vessel.name}")
|
||||||
|
|
Loading…
Reference in a new issue