diff options
Diffstat (limited to 'perl-install/log.pm')
| -rw-r--r-- | perl-install/log.pm | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/perl-install/log.pm b/perl-install/log.pm index 2e1da1a77..853cabc8c 100644 --- a/perl-install/log.pm +++ b/perl-install/log.pm @@ -2,6 +2,7 @@ package log; use diagnostics; use strict; +use c; #-##################################################################################### @@ -14,33 +15,42 @@ my $logDebugMessages = 0; #-###################################################################################### #- Functions #-###################################################################################### -sub fd() { fileno LOG } sub F() { *LOG } sub l { $logOpen or openLog(); - print LOG "* ", @_, "\n"; - print LOG2 "* ", @_, "\n"; + if ($::isStandalone) { + c::syslog(join "", @_); + } else { + print LOG "* ", @_, "\n"; + print LOG2 "* ", @_, "\n"; + } } sub ld { $logDebugMessages and &l } sub w { &l } sub openLog(;$) { if ($::isStandalone) { - open LOG, ">&STDERR"; - } elsif ($_[0]) { #- useLocal - open LOG, "> $_[0]";# or die "no log possible :("; + c::openlog("DrakX"); } else { - open LOG, "> /dev/tty3" or open LOG, ">> /tmp/install.log";# or die "no log possible :("; + if ($_[0]) { #- useLocal + open LOG, "> $_[0]";# or die "no log possible :("; + } else { + open LOG, "> /dev/tty3" or open LOG, ">> /tmp/install.log";# or die "no log possible :("; + } + open LOG2, ">> /tmp/ddebug.log";# or die "no log possible :("; + select((select(LOG), $| = 1)[0]); + select((select(LOG2), $| = 1)[0]); } - open LOG2, ">> /tmp/ddebug.log";# or die "no log possible :("; - select((select(LOG), $| = 1)[0]); - select((select(LOG2), $| = 1)[0]); exists $ENV{DEBUG} and $logDebugMessages = 1; $logOpen = 1; } -sub closeLog() { close LOG; close LOG2; } +sub closeLog() { + if ($::isStandalone) { + c::closelog(); + } else { close LOG; close LOG2; } +} #-###################################################################################### #- Wonderful perl :( |