FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

FHEMWEB nofork renamed to plotfork, default changed from forking to no-forking

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@852 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-03-10 18:03:22 +00:00
parent c6855bc1ed
commit 796f05d673
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/docs/commandref.html
View File

@ -957,7 +957,7 @@ A line ending with \ will be concatenated with the next one, so long lines
Recommended level is 3 for normal use. Recommended level is 3 for normal use.
</li><br> </li><br>
<a name="dupInterval"></a> <a name="dupTimeout"></a>
<li>dupTimeout<br> <li>dupTimeout<br>
Define the timeout for which 2 identical events from two different Define the timeout for which 2 identical events from two different
receiver are considered a duplicate. Default is 0.5 seconds. receiver are considered a duplicate. Default is 0.5 seconds.
@ -5585,10 +5585,10 @@ Terminating
Safari, add it to the home-screen to get full-screen support. Safari, add it to the home-screen to get full-screen support.
</li><br> </li><br>
<a name="nofork"></a> <a name="plotfork"></a>
<li>nofork<br> <li>plotfork<br>
If set, do not generate the logs in a parallel process. Needed If set, generate the logs in a parallel process. Note: do not use it
on some Fritzbox installations. on Windows and on systems with small memory foorprint.
</li><br> </li><br>
<a name="basicAuth"></a> <a name="basicAuth"></a>

6
fhem/webfrontend/pgm2/01_FHEMWEB.pm
View File

@ -74,7 +74,7 @@ FHEMWEB_Initialize($)
$hash->{UndefFn} = "FW_Undef"; $hash->{UndefFn} = "FW_Undef";
$hash->{AttrList}= "loglevel:0,1,2,3,4,5,6 webname fwmodpath fwcompress " . $hash->{AttrList}= "loglevel:0,1,2,3,4,5,6 webname fwmodpath fwcompress " .
"plotmode:gnuplot,gnuplot-scroll,SVG plotsize refresh " . "plotmode:gnuplot,gnuplot-scroll,SVG plotsize refresh " .
"smallscreen nofork basicAuth basicAuthMsg HTTPS"; "smallscreen plotfork basicAuth basicAuthMsg HTTPS";
############### ###############
# Initialize internal structures # Initialize internal structures
@ -192,7 +192,7 @@ FW_Read($)
if($hash->{SSL}) { if($hash->{SSL}) {
my $ret = IO::Socket::SSL->start_SSL($nhash{CD}, { SSL_server=>1, }); my $ret = IO::Socket::SSL->start_SSL($nhash{CD}, { SSL_server=>1, });
Log 1, "SSL: $!" if(!$ret && $! ne "Socket is not connected"); Log 1, "FHEMWEB HTTPS: $!" if(!$ret && $! ne "Socket is not connected");
} }
Log($ll, "Connection accepted from $nhash{NAME}"); Log($ll, "Connection accepted from $nhash{NAME}");
@ -256,7 +256,7 @@ FW_Read($)
Log($ll, "HTTP $name GET $arg"); Log($ll, "HTTP $name GET $arg");
my $pid; my $pid;
if(!AttrVal($FW_wname, "nofork", undef)) { if(AttrVal($FW_wname, "plotfork", undef)) {
# Process SVG rendering as a parallel process # Process SVG rendering as a parallel process
return if(($arg =~ m/cmd=showlog/) && ($pid = fork)); return if(($arg =~ m/cmd=showlog/) && ($pid = fork));
} }