From 18a7daac0499b28ec62325ba9e59b0a345ab08e9 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Thu, 10 Mar 2011 18:03:22 +0000 Subject: [PATCH] FHEMWEB nofork renamed to plotfork, default changed from forking to no-forking git-svn-id: https://svn.fhem.de/fhem/trunk@852 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/docs/commandref.html | 10 +++++----- fhem/webfrontend/pgm2/01_FHEMWEB.pm | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html index ae3500a85..8e0c06956 100644 --- a/fhem/docs/commandref.html +++ b/fhem/docs/commandref.html @@ -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.
- +
  • dupTimeout
    Define the timeout for which 2 identical events from two different 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.

  • - -
  • nofork
    - If set, do not generate the logs in a parallel process. Needed - on some Fritzbox installations. + +
  • plotfork
    + If set, generate the logs in a parallel process. Note: do not use it + on Windows and on systems with small memory foorprint.

  • diff --git a/fhem/webfrontend/pgm2/01_FHEMWEB.pm b/fhem/webfrontend/pgm2/01_FHEMWEB.pm index f0688fcec..b3540e872 100755 --- a/fhem/webfrontend/pgm2/01_FHEMWEB.pm +++ b/fhem/webfrontend/pgm2/01_FHEMWEB.pm @@ -74,7 +74,7 @@ FHEMWEB_Initialize($) $hash->{UndefFn} = "FW_Undef"; $hash->{AttrList}= "loglevel:0,1,2,3,4,5,6 webname fwmodpath fwcompress " . "plotmode:gnuplot,gnuplot-scroll,SVG plotsize refresh " . - "smallscreen nofork basicAuth basicAuthMsg HTTPS"; + "smallscreen plotfork basicAuth basicAuthMsg HTTPS"; ############### # Initialize internal structures @@ -192,7 +192,7 @@ FW_Read($) if($hash->{SSL}) { 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}"); @@ -256,7 +256,7 @@ FW_Read($) Log($ll, "HTTP $name GET $arg"); my $pid; - if(!AttrVal($FW_wname, "nofork", undef)) { + if(AttrVal($FW_wname, "plotfork", undef)) { # Process SVG rendering as a parallel process return if(($arg =~ m/cmd=showlog/) && ($pid = fork)); }