@@ -1,6 +1,6 @@

 #!/usr/bin/perl

 # parser pentru mesajele MQTT

-# Version: 1.0.7

+# Version: 1.0.8

 use strict;

 use warnings;

@@ -58,10 +58,14 @@ while (my $mqttMessage = <$SUB> ) {

       (my $root, my $topic, my $queue) = split /\//, $channel;

       # aleg canalele de unde salvez date in DB:

       if ($queue eq "LWT"){

-        #stergem consumul pentru azi si ieri cand este offline priza

+        # stergem consumul pentru azi si ieri cand este offline priza

         if ($nonjson eq 'Offline') {

           delDB($topic);

-        }        

+        }

+        # salvam ultima stare a releului

+        my $script="php /admin/scripts/mqttparser/last_state.php $topic $nonjson\n";

+        runSCRIPT ($script);

+        # salvam in DB statusul online/offline

         addDB ($topic, "LWT", $nonjson);

       }

       else {

@@ -129,7 +133,8 @@ while (my $mqttMessage = <$SUB> ) {

       } 

       if ($queue eq "ALARM"){

         $json=~ s/\"/\\"/g;

-        pushALARM ($topic, $json);

+        my $script="php /admin/scripts/mqttparser/alarm.php $topic $json";

+	runSCRIPT ($script);

       }      

     }

   }

@@ -143,16 +148,15 @@ if ($daemon==1){

   }

 }

-# loghez alarmele pe care le trimit

-sub pushALARM {

-  (my $topic, my $json) = @_;

-  my $script = "php /admin/scripts/alarma/alarm.php $topic $json";

-  my $logfile='/var/log/mqttparser/mqtt-alarm.log';   

+# rulez scripturi cand primesc input specific via mqtt

+sub runSCRIPT { 

+  (my $script) = @_;

+  my $logfile='/var/log/mqttparser/scripts.log';

   my $timealarm = strftime("%d/%m/%Y %H:%M:%S", localtime(time));

-  open (my $lh, '>>', $logfile) or die "Cannot open $logfile";

-  print $lh "$timealarm - Am lansat: $script";

-  close $lh;

-  system('1', "$script"); # lansez scriptul de alarma cu timeout 1 secunda

+  open (my $fh, '>>', $logfile) or die "Cannot open $logfile";

+  print $fh "$timealarm - Am lansat: $script";

+  close $fh;

+  system('1', "$script"); # lansez scriptul

   return;

 }