From ace7cc6d3c0db1e44f5a2c9a22c5a13c1f649cd3 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Thu, 7 Jul 2011 08:46:28 +0000
Subject: [PATCH] shutdown/rereadcfg added

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@932 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/docs/commandref.html | 4 ++--
 fhem/fhem.pl              | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html
index 1376766cd..d493bed49 100644
--- a/fhem/docs/commandref.html
+++ b/fhem/docs/commandref.html
@@ -706,7 +706,7 @@ A line ending with \ will be concatenated with the next one, so long lines
   Re-read the configuration file.
   Note: The statefile will be saved first, then the config file will be read
   (all devices will be initialized again), and at last the statefile will be
-  reloaded.
+  reloaded. It triggers upon completion the global:REREADCFG event.
   <br><br>
   Example:
   <ul>
@@ -783,7 +783,7 @@ A line ending with \ will be concatenated with the next one, so long lines
   <code>shutdown</code>
   <br><br>
   Shut down the server (after saving the <a href="#statefile">state information
-  </a>)
+  </a>). It triggers the global:SHUTDOWN event.
   <br><br>
   Example:
   <ul>
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index eb47ff34d..d46710599 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -167,7 +167,7 @@ my $nextat;                     # Time when next timer will be triggered.
 my $intAtCnt=0;
 my %duplicate;                  # Pool of received msg for multi-fhz/cul setups
 my $duplidx=0;                  # helper for the above pool
-my $cvsid = '$Id: fhem.pl,v 1.144 2011-06-19 06:17:27 rudolfkoenig Exp $';
+my $cvsid = '$Id: fhem.pl,v 1.145 2011-07-07 08:46:28 rudolfkoenig Exp $';
 my $namedef =
   "where <name> is either:\n" .
   "- a single device name\n" .
@@ -912,6 +912,7 @@ CommandRereadCfg($$)
   if(!$ret && $attr{global}{statefile} && -r $attr{global}{statefile}) {
     $ret = CommandInclude($cl, $attr{global}{statefile});
   }
+  DoTrigger("global", "REREADCFG");
 
   $reread_active=0;
   return $ret;
@@ -1021,6 +1022,7 @@ sub
 CommandShutdown($$)
 {
   my ($cl, $param) = @_;
+  DoTrigger("global", "SHUTDOWN");
   Log 0, "Server shutdown";
 
   foreach my $d (sort keys %defs) {