From 4ea7fd0dbd19c6ab7c4254c7ebaf93ba7366eb49 Mon Sep 17 00:00:00 2001
From: loredo <loredo@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Mon, 19 Oct 2015 11:58:11 +0000
Subject: [PATCH] msg: logging

git-svn-id: https://svn.fhem.de/fhem/trunk@9538 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/98_msg.pm    | 21 ++++++++++++++++-----
 fhem/contrib/msgSchema.pm |  4 ++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/fhem/contrib/98_msg.pm b/fhem/contrib/98_msg.pm
index 261f36db1..c98c17081 100755
--- a/fhem/contrib/98_msg.pm
+++ b/fhem/contrib/98_msg.pm
@@ -69,11 +69,12 @@ sub CommandMsg($$;$$) {
     } else {
       fhem "define msgConfig msgConfig";
       $globalDevName = "msgConfig";
-      $return .= "Global configuration device msgConfig was created.";
+      $return .= "Global configuration device msgConfig was created.\n\n";
     }
 
     if ( $msg eq "" || $msg =~ /^\?[\s\t]*$/ || $msg eq "help" ) {
         return
+$return .
 "Usage: msg [<type>] [<\@device>|<e-mail address>] [<priority>] [|<title>|] <message>";
     }
 
@@ -1826,10 +1827,16 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
 
                                 Log3 $logDevice, 3,
 "msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev RECIPIENT=$subRecipient STATUS=$routeStatus PRIORITY=$loopPriority($priorityCat) TITLE='$loopTitle' MSG='$msg'"
-                                  if ( $priorityCat ne "" );
+                                  if ( $priorityCat ne "" && $subRecipient ne "");
                                 Log3 $logDevice, 3,
 "msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev RECIPIENT=$subRecipient STATUS=$routeStatus PRIORITY=$loopPriority TITLE='$loopTitle' MSG='$msg'"
-                                  if ( $priorityCat eq "" );
+                                  if ( $priorityCat eq "" && $subRecipient ne "");
+                                  Log3 $logDevice, 3,
+  "msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev STATUS=$routeStatus PRIORITY=$loopPriority($priorityCat) TITLE='$loopTitle' MSG='$msg'"
+                                    if ( $priorityCat ne "" && $subRecipient eq "");
+                                  Log3 $logDevice, 3,
+  "msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev STATUS=$routeStatus PRIORITY=$loopPriority TITLE='$loopTitle' MSG='$msg'"
+                                    if ( $priorityCat eq "" && $subRecipient eq "");
 
                                   $messageSent                 = 1 if ($error == 0);
                                   $messageSentDev              = 1 if ($error == 0);
@@ -1839,12 +1846,16 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
                                 || $routeStatus eq "UNDEFINED" )
                             {
                                 Log3 $logDevice, 3,
-"msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev RECIPIENT=$subRecipient STATUS=$routeStatus PRIORITY=$loopPriority TITLE='$loopTitle' '$msg'";
+"msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev RECIPIENT=$subRecipient STATUS=$routeStatus PRIORITY=$loopPriority TITLE='$loopTitle' '$msg'" if ($subRecipient ne "");
+                                Log3 $logDevice, 3,
+"msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev STATUS=$routeStatus PRIORITY=$loopPriority TITLE='$loopTitle' '$msg'" if ($subRecipient eq "");
                                 $gatewaysStatus{$gatewayDev} = $routeStatus;
                             }
                             else {
                                 Log3 $logDevice, 3,
-"msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev RECIPIENT=$subRecipient STATUS=$routeStatus PRIORITY=$loopPriority TITLE='$loopTitle' '$msg'";
+"msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev RECIPIENT=$subRecipient STATUS=$routeStatus PRIORITY=$loopPriority TITLE='$loopTitle' '$msg'" if ($subRecipient ne "");
+                                Log3 $logDevice, 3,
+"msg $device: ID=$messageID.$sentCounter TYPE=$type[$i] ROUTE=$gatewayDev STATUS=$routeStatus PRIORITY=$loopPriority TITLE='$loopTitle' '$msg'" if ($subRecipient eq "");
                                 $messageSent    = 2 if ( $messageSent != 1 );
                                 $messageSentDev = 2 if ( $messageSentDev != 1 );
                                 $gatewaysStatus{$gatewayDev} = $routeStatus;
diff --git a/fhem/contrib/msgSchema.pm b/fhem/contrib/msgSchema.pm
index ad8993a76..6a19030e4 100755
--- a/fhem/contrib/msgSchema.pm
+++ b/fhem/contrib/msgSchema.pm
@@ -75,8 +75,8 @@ my $db = {
   'light' => {
 
     'HUEDevice' => {
-      'Normal'  => '{my $state=ReadingsVal("%DEVICE%","state","off"); fhem "set %DEVICE% blink 2 1"; fhem "sleep 4;set %DEVICE%:FILTER=state!=$state $state"}',
-      'High'    => '{my $state=ReadingsVal("%DEVICE%","state","off"); fhem "set %DEVICE% blink 10 1"; fhem "sleep 20;set %DEVICE%:FILTER=state!=$state $state"}',
+      'Normal'  => '{my $state=ReadingsVal("%DEVICE%","state","off"); fhem "set %DEVICE% blink 2 1"; fhem "sleep 4.25;set %DEVICE%:FILTER=state!=$state $state"}',
+      'High'    => '{my $state=ReadingsVal("%DEVICE%","state","off"); fhem "set %DEVICE% blink 10 1"; fhem "sleep 20.25;set %DEVICE%:FILTER=state!=$state $state"}',
       'Low'     => 'set %DEVICE% alert select',
     },