From f45ddf5d5a015b522ce040a999ab29da70e64de1 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Wed, 9 Dec 2015 09:40:33 +0000
Subject: [PATCH] Task #8725: logger stuff. return checksum tuple from
transfer.
---
LTA/LTAIngest/ltacp.py | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/LTA/LTAIngest/ltacp.py b/LTA/LTAIngest/ltacp.py
index 257a0de0526..615a850ff14 100644
--- a/LTA/LTAIngest/ltacp.py
+++ b/LTA/LTAIngest/ltacp.py
@@ -13,15 +13,16 @@ from socket import getfqdn
import os, sys, getpass
import time
-log_handler = logging.StreamHandler()
-formatter = logging.Formatter('%(asctime)-15s %(levelname)s %(message)s')
-formatter.converter = time.gmtime
-log_handler.setFormatter(formatter)
logger = logging.getLogger('Slave')
-logger.addHandler(log_handler)
-logger.setLevel(logging.INFO)
-logger = logging.getLogger('Slave')
+if __name__ == '__main__':
+ log_handler = logging.StreamHandler()
+ formatter = logging.Formatter('%(asctime)-15s %(levelname)s %(message)s')
+ formatter.converter = time.gmtime
+ log_handler.setFormatter(formatter)
+ logger.addHandler(log_handler)
+ logger.setLevel(logging.INFO)
+
class LtacpException(Exception):
def __init__(self, value):
@@ -55,12 +56,17 @@ def removeRemoteFile(user, host, filepath):
def transfer(src_host,
src_path_data,
dst_surl,
- src_user=getpass.getuser(),
+ src_user=None,
port_data='40000',
port_md5='50000',
local_data_fifo=None,
- remote_data_fifo=None
- ):
+ remote_data_fifo=None):
+
+ if not src_user:
+ src_user = getpass.getuser()
+
+ port_data = str(port_data)
+ port_md5 = str(port_md5)
dst_turl = convert_surl_to_turl(dst_surl)
logger.info('ltacp: initiating transfer of %s:%s to %s' % (src_host, src_path_data, dst_surl))
@@ -263,7 +269,7 @@ def transfer(src_host,
logger.info('ltacp: terminated', p.pid)
logger.info('ltacp: successfully completed transfer of %s:%s to %s' % (src_host, src_path_data, dst_surl))
- return code
+ return (md5_checksum_local, a32_checksum_local)
# execute command and optionally return exit code or output streams
--
GitLab