1
0

debugging

This commit is contained in:
2022-01-28 23:05:58 +01:00
parent 1361cb9395
commit 425107cec7
22 changed files with 167 additions and 136 deletions

View File

@@ -1,5 +1,5 @@
<?php
logger(DEBUG,"Including events.php");
logger(DEBUG, _("Including events.php"));
/* for all functions, datetime parameter format is 'dd/mm/yy hh:mm:ss' */
@@ -15,13 +15,13 @@ function checkEvents()
$now = now();
if (!empty($event->startDatetime))
{
logger(DEBUG, _("StarDatetime is set"));
logger(DEBUG, _("StarDatetime is set"), __FILE__ . ":" . __LINE__);
if($event->dateTimeEvent < $now)
{
logger(DEBUG, _("Event must be executed"));
logger(DEBUG, _("Event must be executed"), __FILE__ . ":" . __LINE__);
if (!empty($event->exceptionInterval))
{
logger(DEBUG, _("Testing exceptions"));
logger(DEBUG, _("Testing exceptions"), __FILE__ . ":" . __LINE__);
foreach($event->exceptionInterval as $key => $value)
{
if($now > $value->start and $now < $value->end)
@@ -35,17 +35,17 @@ function checkEvents()
}
if ($exception === false)
{
logger(DEBUG, sprintf(_("sending command set %s => %s for %s"), $event->param ,bool2string($event->value), $event->device->friendlyName));
logger(DEBUG, sprintf(_("sending command set %s => %s for %s"), $event->param ,bool2string($event->value), $event->device->friendlyName), __FILE__ . ":" . __LINE__);
publish(mktopic($event->device), array($event->param => $event->value), "set", $key);
if (($event->dateTimeEvent->add($event->recurrenceInterval)) === false)
{
logger(ERROR, _("Error in adding interval to event recurrence. event: ") . $key);
logger(ERROR, _("Error in adding interval to event recurrence. event: ") . $key, __FILE__ . ":" . __LINE__);
}
}
}
}elseif (!empty($event->dateTimeEvent) and $event->dateTimeEvent < now())
{
logger(DEBUG, sprintf(_("Sending command set %s => %s to %s"),$event->param, bool2string($event->value), $event->device->friendlyName));
logger(DEBUG, sprintf(_("Sending command set %s => %s to %s"),$event->param, bool2string($event->value), $event->device->friendlyName), __FILE__ . ":" . __LINE__);
$mid = publish(mktopic($event->device), array($event->param => $event->value), "set"); //, $key);
$event->published = $now;
//echo "#################################\nUnsetting event $key \n###########################" . EOL;
@@ -95,7 +95,7 @@ function setRecurrentEvent(&$device, $property, $value, $startDatetime, $stopDat
$event->dateTimeEvent = $event->startDatetime;
if (($event->dateTimeEvent->add($event->recurrenceInterval)) === false)
{
logger(ERROR, _("Error in event recurrence. event: ") . $key);
logger(ERROR, _("Error in event recurrence. event: ") . $key, __FILE__ . ":" . __LINE__);
}
}
@@ -133,11 +133,11 @@ function setDelay(&$device, $delay, $unit="second", $property, $value, $replace=
}
if (empty($s))
{
logger(ERROR, _("setDelay error: unit is empty"));
logger(ERROR, _("setDelay error: unit is empty"), __FILE__ . ":" . __LINE__);
}
if (($datetime->add(new DateInterval('PT'. $delay . $s))) === false)
{
logger(ERROR, _("setDelay error: datetime->add"));
logger(ERROR, _("setDelay error: datetime->add"), __FILE__ . ":" . __LINE__);
}
//print_r($datetime);
if ($replace)
@@ -154,7 +154,7 @@ function setDelay(&$device, $delay, $unit="second", $property, $value, $replace=
$events[$key]->param = $property;
$events[$key]->value = $value;
$events[$key]->device = & $device;
logger (DEBUG, _('Setting new delay in $events[]'));
logger (DEBUG, _('Setting new delay in $events[]'), __FILE__ . ":" . __LINE__);
print_r($events[$key]);
$loglevel = $oldLevel;
}
@@ -170,7 +170,7 @@ function removeEvent($device, $property , $value)
function searchEvent($device, $property , $value)
{
global $events;
logger(DEBUG, _("searching event for device %s, property %s and value %s"), $device->friendlyName, $property, bool2string($value));
logger(DEBUG, _("searching event for device %s, property %s and value %s"), $device->friendlyName, $property, bool2string($value), __FILE__ . ":" . __LINE__);
foreach($events as $key => $event)
{
//echo "Event : $event => $value" . EOL;
@@ -190,11 +190,11 @@ function deleteEvent($eventKey)
if ($eventKey !== false)
{
unset ($events[$eventKey]);
logger(INFO, _("delete event key =") . $eventKey);
logger(INFO, _("delete event key =") . $eventKey, __FILE__ . ":" . __LINE__);
}else
{
//try to delete an flase event
logger(WARNING, _("Try to delete event with key = ") . var_dump($eventKey));
logger(WARNING, _("Try to delete event with key = ") . var_dump($eventKey), __FILE__ . ":" . __LINE__);
}
}