Skip to content
Snippets Groups Projects
Commit aa320599 authored by sveseli's avatar sveseli
Browse files

fix for logging errors

parent 7508c23f
No related branches found
No related tags found
No related merge requests found
...@@ -43,7 +43,7 @@ class FileTransferPlugin(FileProcessor): ...@@ -43,7 +43,7 @@ class FileTransferPlugin(FileProcessor):
return destUrl return destUrl
def getFullCommand(self, src, dest): def getFullCommand(self, src, dest):
return '%s %s %s' % (self.command, src, dest) return '%s "%s" "%s"' % (self.command, src, dest)
def setSrc(self, src): def setSrc(self, src):
self.src = src self.src = src
......
...@@ -16,8 +16,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin): ...@@ -16,8 +16,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
DEFAULT_PORT = 2811 DEFAULT_PORT = 2811
def __init__(self, src=None, dest=None, command=DEFAULT_COMMAND, localMd5Sum=True, def __init__(self, src=None, dest=None, command=DEFAULT_COMMAND, localMd5Sum=True, remoteMd5Sum=False, deleteOriginal=False, pluginMustProcessFiles=True):
remoteMd5Sum=False, deleteOriginal=False, pluginMustProcessFiles=True):
FileTransferPlugin.__init__(self, command, src, dest) FileTransferPlugin.__init__(self, command, src, dest)
self.dsFileApi = DsRestApiFactory.getFileRestApi() self.dsFileApi = DsRestApiFactory.getFileRestApi()
self.localMd5Sum = localMd5Sum self.localMd5Sum = localMd5Sum
...@@ -51,14 +50,14 @@ class GridftpFileTransferPlugin(FileTransferPlugin): ...@@ -51,14 +50,14 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
storageHost = uploadInfo['storageHost'] storageHost = uploadInfo['storageHost']
storageDirectory = uploadInfo['storageDirectory'] storageDirectory = uploadInfo['storageDirectory']
dataDirectory = uploadInfo['dataDirectory'] dataDirectory = uploadInfo['dataDirectory']
self.logger.debug('Upload info: %s', uploadInfo) self.logger.debug('Upload info: %s' % uploadInfo)
# Original data directory may contain host/port # Original data directory may contain host/port
(scheme, host, port, replacementDirPath) = FtpUtility.parseFtpUrl(dataDirectory) (scheme, host, port, replacementDirPath) = FtpUtility.parseFtpUrl(dataDirectory)
self.logger.debug('Number of original files: %s', len(filePathsDict)) self.logger.debug('Number of original files: %s' % len(filePathsDict))
self.logger.debug('Looking for existing files in %s', storageDirectory) self.logger.debug('Looking for existing files in %s' % storageDirectory)
ftpUtility = SftpUtility(storageHost) ftpUtility = SftpUtility(storageHost)
storageFilePathsDict = ftpUtility.getFiles(storageDirectory, {}, replacementDirPath) storageFilePathsDict = ftpUtility.getFiles(storageDirectory, {}, replacementDirPath)
self.logger.debug('There are %s files in %s', (len(storageFilePathsDict), storageDirectory)) self.logger.debug('There are %s files in %s' % (len(storageFilePathsDict), storageDirectory))
# Remove file from plugin dict if we do not need to transfer it # Remove file from plugin dict if we do not need to transfer it
for (filePath,storageFilePathDict) in storageFilePathsDict.items(): for (filePath,storageFilePathDict) in storageFilePathsDict.items():
filePathDict = filePathsDict.get(filePath) filePathDict = filePathsDict.get(filePath)
...@@ -84,7 +83,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin): ...@@ -84,7 +83,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
# No need to transfer file # No need to transfer file
del filePathsDict[filePath] del filePathsDict[filePath]
self.logger.debug('Number of files that require processing: %s', len(filePathsDict)) self.logger.debug('Number of files that require processing: %s' % len(filePathsDict))
return filePathsDict return filePathsDict
def processFile(self, fileInfo): def processFile(self, fileInfo):
......
...@@ -42,7 +42,7 @@ class RsyncFileTransferPlugin(FileTransferPlugin): ...@@ -42,7 +42,7 @@ class RsyncFileTransferPlugin(FileTransferPlugin):
filePathDict = filePathsDict.get(filePath) filePathDict = filePathsDict.get(filePath)
if filePathDict: if filePathDict:
pluginFilePathsDict[filePath] = filePathDict pluginFilePathsDict[filePath] = filePathDict
self.logger.debug('Number of original files: %s, number of plugin files: %s', len(filePathsDict), len(pluginFilePathsDict)) self.logger.debug('Number of original files: %s, number of plugin files: %s' % len(filePathsDict), len(pluginFilePathsDict))
return pluginFilePathsDict return pluginFilePathsDict
def processFile(self, fileInfo): def processFile(self, fileInfo):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment