mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-13 17:26:34 +00:00
Some more details in the output
git-svn-id: https://svn.fhem.de/fhem/trunk@851 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
eb893f97bf
commit
c6855bc1ed
14
fhem/fhem.pl
14
fhem/fhem.pl
@ -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.135 2011-03-04 06:48:28 rudolfkoenig Exp $';
|
my $cvsid = '$Id: fhem.pl,v 1.136 2011-03-10 17:42:01 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" .
|
||||||
@ -299,7 +299,7 @@ if($attr{global}{logfile} ne "-" && !$attr{global}{nofork}) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
my $ret = CommandInclude(undef, $attr{global}{configfile});
|
my $ret = CommandInclude(undef, $attr{global}{configfile});
|
||||||
Log 1, $ret if($ret);
|
Log 1, "configfile: $ret" if($ret);
|
||||||
die("No port specified in the configfile.\n") if(!$server);
|
die("No port specified in the configfile.\n") if(!$server);
|
||||||
|
|
||||||
if($attr{global}{statefile} && -r $attr{global}{statefile}) {
|
if($attr{global}{statefile} && -r $attr{global}{statefile}) {
|
||||||
@ -929,7 +929,7 @@ WriteStatefile()
|
|||||||
{
|
{
|
||||||
return if(!$attr{global}{statefile});
|
return if(!$attr{global}{statefile});
|
||||||
if(!open(SFH, ">$attr{global}{statefile}")) {
|
if(!open(SFH, ">$attr{global}{statefile}")) {
|
||||||
my $msg = "Cannot open $attr{global}{statefile}: $!";
|
my $msg = "WriteStateFile: Cannot open $attr{global}{statefile}: $!";
|
||||||
Log 1, $msg;
|
Log 1, $msg;
|
||||||
return $msg;
|
return $msg;
|
||||||
}
|
}
|
||||||
@ -1170,7 +1170,7 @@ CommandDefine($$)
|
|||||||
|
|
||||||
my $ret = CallFn($a[0], "DefFn", \%hash, $def);
|
my $ret = CallFn($a[0], "DefFn", \%hash, $def);
|
||||||
if($ret) {
|
if($ret) {
|
||||||
Log 1, $ret;
|
Log 1, "define: $ret";
|
||||||
delete $defs{$a[0]}; # Veto
|
delete $defs{$a[0]}; # Veto
|
||||||
delete $attr{$a[0]};
|
delete $attr{$a[0]};
|
||||||
|
|
||||||
@ -1425,7 +1425,7 @@ CommandReload($$)
|
|||||||
eval {
|
eval {
|
||||||
my $ret=do "$file";
|
my $ret=do "$file";
|
||||||
if(!$ret) {
|
if(!$ret) {
|
||||||
Log 1,"Error:Modul $param deactivated:\n $@";
|
Log 1, "reload: Error:Modul $param deactivated:\n $@";
|
||||||
use strict "refs";
|
use strict "refs";
|
||||||
return "$@";
|
return "$@";
|
||||||
}
|
}
|
||||||
@ -1543,7 +1543,7 @@ GlobalAttr($$)
|
|||||||
$ipv6 = 1;
|
$ipv6 = 1;
|
||||||
eval "require IO::Socket::INET6; use Socket6;";
|
eval "require IO::Socket::INET6; use Socket6;";
|
||||||
if($@) {
|
if($@) {
|
||||||
Log 1, $@;
|
Log 1, "attr global port: $@";
|
||||||
Log 1, "Can't load INET6, falling back to IPV4";
|
Log 1, "Can't load INET6, falling back to IPV4";
|
||||||
$ipv6 = 0;
|
$ipv6 = 0;
|
||||||
}
|
}
|
||||||
@ -1560,7 +1560,7 @@ GlobalAttr($$)
|
|||||||
$server2 = $ipv6 ? IO::Socket::INET6->new(@opts) :
|
$server2 = $ipv6 ? IO::Socket::INET6->new(@opts) :
|
||||||
IO::Socket::INET->new(@opts);
|
IO::Socket::INET->new(@opts);
|
||||||
if(!$server2) {
|
if(!$server2) {
|
||||||
Log 1, "Can't open server port at $port: $!";
|
Log 1, "attr global port: Can't open server port at $port: $!";
|
||||||
return "$!" if($init_done);
|
return "$!" if($init_done);
|
||||||
die "Can't open server port at $port: $!\n";
|
die "Can't open server port at $port: $!\n";
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user