FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 01:46:08 +00:00
Code Issues Releases Wiki Activity

Logfile/redirect bugs fixed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@844 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-02-28 07:27:10 +00:00
parent 41f53cbe90
commit 2cf433cab2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/fhem.pl
View File

@ -167,7 +167,7 @@ my $nextat; # Time when next timer will be triggered.
my $intAtCnt=0; my $intAtCnt=0;
my %duplicate; # Pool of received msg for multi-fhz/cul setups my %duplicate; # Pool of received msg for multi-fhz/cul setups
my $duplidx=0; # helper for the above pool my $duplidx=0; # helper for the above pool
my $cvsid = '$Id: fhem.pl,v 1.133 2011-02-27 18:47:13 rudolfkoenig Exp $'; my $cvsid = '$Id: fhem.pl,v 1.134 2011-02-28 07:27:10 rudolfkoenig Exp $';
my $namedef = my $namedef =
"where <name> is either:\n" . "where <name> is either:\n" .
"- a single device name\n" . "- a single device name\n" .
@ -317,7 +317,6 @@ if($pfn) {
} }
$init_done = 1; $init_done = 1;
redirectStdinStdErr();
DoTrigger("global", "INITIALIZED"); DoTrigger("global", "INITIALIZED");
Log 0, "Server started (version $attr{global}{version}, pid $$)"; Log 0, "Server started (version $attr{global}{version}, pid $$)";
@ -510,7 +509,7 @@ Log($$)
my @t = localtime; my @t = localtime;
my $nfile = ResolveDateWildcards($attr{global}{logfile}, @t); my $nfile = ResolveDateWildcards($attr{global}{logfile}, @t);
OpenLogfile($nfile) if($currlogfile && $currlogfile ne $nfile); OpenLogfile($nfile) if(!$currlogfile || $currlogfile ne $nfile);
my $tim = sprintf("%04d.%02d.%02d %02d:%02d:%02d", my $tim = sprintf("%04d.%02d.%02d %02d:%02d:%02d",
$t[5]+1900,$t[4]+1,$t[3], $t[2],$t[1],$t[0]); $t[5]+1900,$t[4]+1,$t[3], $t[2],$t[1],$t[0]);
@ -863,17 +862,16 @@ sub
redirectStdinStdErr() redirectStdinStdErr()
{ {
# Redirect stdin/stderr # Redirect stdin/stderr
my $currlogfile = $attr{global}{logfile}; return if(!$currlogfile || $currlogfile eq "-");
return if($currlogfile eq "-");
open STDIN, '</dev/null' or return "Can't read /dev/null: $!"; open STDIN, '</dev/null' or print "Can't read /dev/null: $!\n";
close(STDERR); close(STDERR);
open(STDERR, ">>$currlogfile") or return "Can't append STDERR to log: $!"; open(STDERR, ">>$currlogfile") or print "Can't append STDERR to log: $!\n";
STDERR->autoflush(1); STDERR->autoflush(1);
close(STDOUT); close(STDOUT);
open STDOUT, '>&STDERR' or return "Can't dup stdout: $!"; open STDOUT, '>&STDERR' or print "Can't dup stdout: $!\n";
STDOUT->autoflush(1); STDOUT->autoflush(1);
} }