Commit 1cfa52b6 authored by Yang Tse's avatar Yang Tse
Browse files

Reinstate hi resolution time logging since this is not what is 

now adding 90 extra seconds to the total time some autobuilds
need to make a full test-run.
parent 57d3488a

tests/ftpserver.pl

+14 −13
Original line number Diff line number Diff line
@@ -43,11 +43,12 @@ use IPC::Open2; 
require "getpart.pm";

require "ftp.pm";



#BEGIN {

#    if($] > 5.006) {

#        use Time::HiRes qw( gettimeofday );

#    }

#}

BEGIN {

    if($] >= 5.007003) {

        require Time::HiRes;

        import  Time::HiRes qw( gettimeofday );

    }

}



#**********************************************************************

# global vars...
@@ -127,18 +128,18 @@ sub getlogfilename { 
#

sub logmsg {

    my $now;

#   if($] > 5.006) {

#       my ($seconds, $usec) = gettimeofday();

#       my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =

#           localtime($seconds);

#       $now = sprintf("%02d:%02d:%02d.%06d ", $hour, $min, $sec, $usec);

#   }

#   else {

    if($] >= 5.007003) {

        my ($seconds, $usec) = gettimeofday();

        my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =

            localtime($seconds);

        $now = sprintf("%02d:%02d:%02d.%06d ", $hour, $min, $sec, $usec);

    }

    else {

        my $seconds = time();

        my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =

            localtime($seconds);

        $now = sprintf("%02d:%02d:%02d ", $hour, $min, $sec);

#   }

    }

    if(open(LOGFILEFH, ">>$logfilename")) {

        print LOGFILEFH $now;

        print LOGFILEFH @_;