diff --git a/SendElabData.pl b/SendElabData.pl index b715991..9e25fe4 100755 --- a/SendElabData.pl +++ b/SendElabData.pl @@ -41,7 +41,7 @@ sub getTimeStamp{ # parm [ts] => timestamp for filename; log => timestamp for ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime(time() - 36000); $format = "%04d-%02d-%02d %02d:%02d:%02d"; } - + my $timestamp =sprintf( $format, $year + 1900, $mon + 1, $mday, $hour, $min, $sec ); return $timestamp; } @@ -106,13 +106,13 @@ sub trxelab { $ftp_parm =~ s/\s//g; my %ftp_parms = ('Host' => $ftp_addrs,); + $ftp_parms{'Debug'} = 0; + $ftp_parms{'Passive'} = 1; foreach my $parm (split(/,/, $ftp_parm)){ my ($key, $val) = split(/=>/, $parm); $ftp_parms{$key} = $val; } - $ftp_parms{'Debug'} = 0; - $ftp_parms{'Passive'} = 1; print getTimeStamp("log") . " - pid $$ >> $unit - $tool ftp parm:\n" . Dumper(%ftp_parms); @@ -124,6 +124,9 @@ sub trxelab { or die getTimeStamp("log"). " - pid $$ >> Cannot connect to $ftp_addrs: $@ \n"; $ftp->login( $ftp_user, $ftp_passwd ) or die getTimeStamp("log"). " - pid $$ >> Cannot login ". $ftp->message . "\n"; + if ( $ftp_parms{"SSL"} ) { + $ftp->starttls(); + } $ftp_target //= ""; if ( $ftp_target ne "" ) { $ftp->cwd($ftp_target)