Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

shutdown restart added

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1146 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-12-26 14:32:39 +00:00
parent b6607c61e9
commit e677cdf420
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGED
View File

@ -10,7 +10,7 @@
- bugfix: FHEM2FHEM should work with CUL again, after syntax change - bugfix: FHEM2FHEM should work with CUL again, after syntax change
- feature: CUL directio mode (No Device::SerialPort needed) - feature: CUL directio mode (No Device::SerialPort needed)
- feature: FritzBox 7270 ZIP file - feature: FritzBox 7270 ZIP file
- buxgfix: prevent fhem from stalling if telnet times out in 66_ECMD.pm - bugfix: prevent fhem from stalling if telnet times out in 66_ECMD.pm
- feature: added postproc ability to classdef in 66_ECMD.pm (Boris, Heinz) - feature: added postproc ability to classdef in 66_ECMD.pm (Boris, Heinz)
- feature: FHEMWEB longpoll mode, small fixes, tuned smallscreen mode - feature: FHEMWEB longpoll mode, small fixes, tuned smallscreen mode
- feature: average module added - feature: average module added
@ -27,6 +27,7 @@
- feature: FHEMWEB save button, smallscreen first screen fix - feature: FHEMWEB save button, smallscreen first screen fix
- feature: FHEMWEB encoding is now UTF-8, alias attribute is respected - feature: FHEMWEB encoding is now UTF-8, alias attribute is respected
- change: HTTPS certs directory moved from cwd into modpath - change: HTTPS certs directory moved from cwd into modpath
- feature: shutdwown parameter restart added
- 2011-07-08 (5.1) - 2011-07-08 (5.1)

4
TODO
View File

@ -1,14 +1,12 @@
FHEM: FHEM:
- uniform .gplot "set title" and naming (ks300_1.gplot -> tempRain.gplot) - FHEM2FHEM reconnect
- HomeMatic set log 2 - HomeMatic set log 2
- mergelog
- autodetect physical hardware - autodetect physical hardware
- RFR: Error message for uncomplete last message - RFR: Error message for uncomplete last message
- implement wiki decisions - implement wiki decisions
Webpgm2 Webpgm2
- setting the dummy state via dropdown is not possible
- click on the graph only correct for the day zoom - click on the graph only correct for the day zoom
- integrate weblink details in the SVG - integrate weblink details in the SVG
- autocreate: multiple plots - autocreate: multiple plots

8
docs/commandref.html
View File

@ -962,14 +962,16 @@ A line ending with \ will be concatenated with the next one, so long lines
<a name="shutdown"></a> <a name="shutdown"></a>
<h3>shutdown</h3> <h3>shutdown</h3>
<ul> <ul>
<code>shutdown</code> <code>shutdown [restart]</code>
<br><br> <br><br>
Shut down the server (after saving the <a href="#statefile">state information Shut down the server (after saving the <a href="#statefile">state information
</a>). It triggers the global:SHUTDOWN event. </a>). It triggers the global:SHUTDOWN event. If the optional restart
parameter is specified, fhem tries to restart itself.
<br><br> <br><br>
Example: Example:
<ul> <ul>
<code>shutdown</code> <code>shutdown</code><br>
<code>shutdown restart</code>
</ul> </ul>
</ul> </ul>

5
fhem.pl
View File

@ -233,7 +233,7 @@ my $commonAttr = "eventMap";
"setdefaultattr" => { Fn=>"CommandDefaultAttr", "setdefaultattr" => { Fn=>"CommandDefaultAttr",
Hlp=>"<attrname> <attrvalue>,set attr for following definitions" }, Hlp=>"<attrname> <attrvalue>,set attr for following definitions" },
"shutdown"=> { Fn=>"CommandShutdown", "shutdown"=> { Fn=>"CommandShutdown",
Hlp=>",terminate the server" }, Hlp=>"[restart],terminate the server" },
"sleep" => { Fn=>"CommandSleep", "sleep" => { Fn=>"CommandSleep",
Hlp=>"<sec>,sleep for sec, 3 decimal places" }, Hlp=>"<sec>,sleep for sec, 3 decimal places" },
"trigger" => { Fn=>"CommandTrigger", "trigger" => { Fn=>"CommandTrigger",
@ -1042,6 +1042,9 @@ CommandShutdown($$)
WriteStatefile(); WriteStatefile();
unlink($attr{global}{pidfilename}) if($attr{global}{pidfilename}); unlink($attr{global}{pidfilename}) if($attr{global}{pidfilename});
if($param && $param eq "restart") {
system("(sleep 2; exec perl $0 $attr{global}{configfile})&");
}
exit(0); exit(0);
} }