diff options
Diffstat (limited to 'tests/serverhelp.pm')
| -rw-r--r-- | tests/serverhelp.pm | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/tests/serverhelp.pm b/tests/serverhelp.pm index fd762935a..1a3c99775 100644 --- a/tests/serverhelp.pm +++ b/tests/serverhelp.pm @@ -29,6 +29,8 @@ package serverhelp; use strict; use warnings; +use Time::HiRes; + BEGIN { use base qw(Exporter); @@ -52,13 +54,6 @@ BEGIN { datasockf_pidfilename datasockf_logfilename ); - - # sub second timestamping needs Time::HiRes - eval { - no warnings "all"; - require Time::HiRes; - import Time::HiRes qw( gettimeofday ); - } } use globalconfig; @@ -81,20 +76,10 @@ our $logfile; # server log file name, for logmsg # logmsg is general message logging subroutine for our test servers. # sub logmsg { - my $now; - # sub second timestamping needs Time::HiRes - if($Time::HiRes::VERSION) { - 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); - } + my ($seconds, $usec) = Time::HiRes::gettimeofday(); + my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = + localtime($seconds); + my $now = sprintf("%02d:%02d:%02d.%06d ", $hour, $min, $sec, $usec); # we see warnings on Windows run that $logfile is used uninitialized # TODO: not found yet where this comes from $logfile = "serverhelp_uninitialized.log" if(!$logfile); |