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

fhem.pl: add optional shutdown exit value (Forum #45202)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10220 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-12-21 12:43:26 +00:00
parent f3956d61b1
commit 68fc2cd687
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/docs/commandref_frame.html
View File

@ -1233,16 +1233,18 @@ The following local attributes are used by a wider range of devices:
<a name="shutdown"></a> <a name="shutdown"></a>
<h3>shutdown</h3> <h3>shutdown</h3>
<ul> <ul>
<code>shutdown [restart]</code> <code>shutdown [restart|exitValue]</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. If the optional restart </a>). It triggers the global:SHUTDOWN event. If the optional restart
parameter is specified, fhem tries to restart itself. parameter is specified, fhem tries to restart itself. exitValue may be
important for start scripts.
<br><br> <br><br>
Example: Example:
<ul> <ul>
<code>shutdown</code><br> <code>shutdown</code><br>
<code>shutdown restart</code> <code>shutdown restart</code><br>
<code>shutdown 1</code><br>
</ul> </ul>
</ul> </ul>

6
fhem/docs/commandref_frame_DE.html
View File

@ -1309,16 +1309,18 @@ Die folgenden lokalen Attribute werden von mehreren Ger&auml;ten verwendet:
<a name="shutdown"></a> <a name="shutdown"></a>
<h3>shutdown</h3> <h3>shutdown</h3>
<ul> <ul>
<code>shutdown [restart]</code> <code>shutdown [restart|exitValue]</code>
<br><br> <br><br>
Der Befehl f&auml;hrt den Server herunter (nach dem sichern aller <a Der Befehl f&auml;hrt den Server herunter (nach dem sichern aller <a
href="#statefile">Ger&auml;testati</a>). Er triggert das global:SHUTDOWN href="#statefile">Ger&auml;testati</a>). Er triggert das global:SHUTDOWN
Ereignis. Mit der optionalen Parameter restart startet FHEM danach neu. Ereignis. Mit der optionalen Parameter restart startet FHEM danach neu.
exitValue ist bei bestimmten Start-programmen von n&oulm;ten.
<br><br> <br><br>
Beispiel: Beispiel:
<ul> <ul>
<code>shutdown</code><br> <code>shutdown</code><br>
<code>shutdown restart</code> <code>shutdown restart</code><br>
<code>shutdown 1</code>
</ul> </ul>
</ul> </ul>

11
fhem/fhem.pl
View File

@ -364,7 +364,7 @@ $readingFnAttributes = "event-on-change-reading event-on-update-reading ".
"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=>"[restart],terminate the server" }, Hlp=>"[restart|exitValue],terminate the server" },
"sleep" => { Fn=>"CommandSleep", "sleep" => { Fn=>"CommandSleep",
Hlp=>"<sec> [<id>] [quiet],sleep for sec, 3 decimal places" }, Hlp=>"<sec> [<id>] [quiet],sleep for sec, 3 decimal places" },
"trigger" => { Fn=>"CommandTrigger", "trigger" => { Fn=>"CommandTrigger",
@ -1496,7 +1496,12 @@ sub
CommandShutdown($$) CommandShutdown($$)
{ {
my ($cl, $param) = @_; my ($cl, $param) = @_;
return "Usage: shutdown [restart]" my $exitValue = 0;
if($param && $param =~ m/^(\d+)$/) {
$exitValue = $1;
$param = "";
}
return "Usage: shutdown [restart|exitvalue]"
if($param && $param ne "restart"); if($param && $param ne "restart");
DoTrigger("global", "SHUTDOWN", 1); DoTrigger("global", "SHUTDOWN", 1);
@ -1517,7 +1522,7 @@ CommandShutdown($$)
exec('cmd.exe /C net stop fhem & net start fhem'); exec('cmd.exe /C net stop fhem & net start fhem');
} }
} }
exit(0); exit($exitValue);
} }