From aa3205993a308d7a690b0bbd5c73e5d7633a00e9 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Sat, 6 Feb 2016 03:17:14 +0000
Subject: [PATCH] fix for logging errors
---
.../common/processing/plugins/fileTransferPlugin.py | 2 +-
.../processing/plugins/gridftpFileTransferPlugin.py | 13 ++++++-------
.../processing/plugins/rsyncFileTransferPlugin.py | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/python/dm/common/processing/plugins/fileTransferPlugin.py b/src/python/dm/common/processing/plugins/fileTransferPlugin.py
index e1a9b549..1cae8d35 100755
--- a/src/python/dm/common/processing/plugins/fileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/fileTransferPlugin.py
@@ -43,7 +43,7 @@ class FileTransferPlugin(FileProcessor):
return destUrl
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):
self.src = src
diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
index 0e690719..d155c3ff 100755
--- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
@@ -16,8 +16,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
DEFAULT_PORT = 2811
- def __init__(self, src=None, dest=None, command=DEFAULT_COMMAND, localMd5Sum=True,
- remoteMd5Sum=False, deleteOriginal=False, pluginMustProcessFiles=True):
+ def __init__(self, src=None, dest=None, command=DEFAULT_COMMAND, localMd5Sum=True, remoteMd5Sum=False, deleteOriginal=False, pluginMustProcessFiles=True):
FileTransferPlugin.__init__(self, command, src, dest)
self.dsFileApi = DsRestApiFactory.getFileRestApi()
self.localMd5Sum = localMd5Sum
@@ -51,14 +50,14 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
storageHost = uploadInfo['storageHost']
storageDirectory = uploadInfo['storageDirectory']
dataDirectory = uploadInfo['dataDirectory']
- self.logger.debug('Upload info: %s', uploadInfo)
+ self.logger.debug('Upload info: %s' % uploadInfo)
# Original data directory may contain host/port
(scheme, host, port, replacementDirPath) = FtpUtility.parseFtpUrl(dataDirectory)
- self.logger.debug('Number of original files: %s', len(filePathsDict))
- self.logger.debug('Looking for existing files in %s', storageDirectory)
+ self.logger.debug('Number of original files: %s' % len(filePathsDict))
+ self.logger.debug('Looking for existing files in %s' % storageDirectory)
ftpUtility = SftpUtility(storageHost)
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
for (filePath,storageFilePathDict) in storageFilePathsDict.items():
filePathDict = filePathsDict.get(filePath)
@@ -84,7 +83,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
# No need to transfer file
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
def processFile(self, fileInfo):
diff --git a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py
index 9cf0837f..0522362e 100755
--- a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py
@@ -42,7 +42,7 @@ class RsyncFileTransferPlugin(FileTransferPlugin):
filePathDict = filePathsDict.get(filePath)
if 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
def processFile(self, fileInfo):
--
GitLab