From 04134e94af8625b942e4cca544c305b232efb8ed Mon Sep 17 00:00:00 2001 From: Tim Retout Date: Thu, 16 Feb 2012 20:22:42 +0000 Subject: Use Exporter in installer::logger. Also rename private subroutines to start with an underscore. --- solenv/bin/modules/installer/logger.pm | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm index f86c4df82eff..2ec03609bdf6 100644 --- a/solenv/bin/modules/installer/logger.pm +++ b/solenv/bin/modules/installer/logger.pm @@ -30,9 +30,27 @@ package installer::logger; use strict; use warnings; +use base 'Exporter'; + use installer::files; use installer::globals; +our @EXPORT_OK = qw( + include_header_into_logfile + include_header_into_globallogfile + include_timestamp_into_logfile + log_hashref + globallog + copy_globalinfo_into_logfile + debuginfo + savedebug + starttime + stoptime + print_message + print_warning + print_error +); + #################################################### # Including header files into the logfile #################################################### @@ -43,7 +61,7 @@ sub include_header_into_logfile my $infoline; - $infoline = "\n" . get_time_string(); + $infoline = "\n" . _get_time_string(); push( @installer::globals::logfileinfo, $infoline); $infoline = "######################################################\n"; @@ -67,7 +85,7 @@ sub include_header_into_globallogfile my $infoline; - $infoline = "\n" . get_time_string(); + $infoline = "\n" . _get_time_string(); push( @installer::globals::globallogfileinfo, $infoline); $infoline = "######################################################\n"; @@ -90,7 +108,7 @@ sub include_timestamp_into_logfile my ($message) = @_; my $infoline; - my $timestring = get_time_string(); + my $timestring = _get_time_string(); $infoline = "$message\t$timestring"; push( @installer::globals::logfileinfo, $infoline); } @@ -131,7 +149,7 @@ sub globallog my $infoline; - $infoline = "\n" . get_time_string(); + $infoline = "\n" . _get_time_string(); push( @installer::globals::globallogfileinfo, $infoline); $infoline = "################################################################\n"; @@ -196,7 +214,7 @@ sub starttime # Convert time string ############################################################### -sub convert_timestring +sub _convert_timestring { my ($secondstring) = @_; @@ -237,11 +255,11 @@ sub convert_timestring # Returning time string for logging ############################################################### -sub get_time_string +sub _get_time_string { my $currenttime = time(); $currenttime = $currenttime - $installer::globals::starttime; - $currenttime = convert_timestring($currenttime); + $currenttime = _convert_timestring($currenttime); $currenttime = localtime() . " \(" . $currenttime . "\)\n"; return $currenttime; } @@ -252,7 +270,7 @@ sub get_time_string sub stoptime { - my $infoline = get_time_string(); + my $infoline = _get_time_string(); print_message( "$infoline" ); } -- cgit v1.2.3