.

diff --git a/.docker/config/monit/conf.d/home b/.docker/config/monit/conf.d/home
index e3f92f52d5164a5211d80c91528ccae271f6e731..f4a0cf24db8563ff84e7c4d1f11e44208a59c36b 100644 (file)
--- a/.docker/config/monit/conf.d/home
+++ b/.docker/config/monit/conf.d/home
@@ -4,12 +4,6 @@ check process home-hue
         start program = "/home/tortugahome/www/servers/startdaemon hue"
         stop program = "/home/tortugahome/www/servers/stopdaemon hue"
 
-check process home-domoticz
-        with pidfile "/var/run/home-domoticz.pid"
-        group homeautomation
-        start program = "/home/tortugahome/www/servers/startdaemon domoticz"
-        stop program = "/home/tortugahome/www/servers/stopdaemon domoticz"
-
 check process home-cron
         with pidfile "/var/run/home-cron.pid"
         group homeautomation

diff --git a/.docker/update b/.docker/update
index 006bc7ffc751d31df8610495c713e782073c28eb..dfd91598b4641d20f32462c18d5dbf85b45a2080 100644 (file)
--- a/.docker/update
+++ b/.docker/update
@@ -8,5 +8,4 @@ docker-compose build --pull
 docker-compose pull
 docker-compose down
 docker-compose up -d
-#docker exec -it tortugahome /application/bin/restarthome
 docker restart nginx-proxy

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1fe400eb22c64779fd82cb23b81f4b1d9a864993..48761f9b9a635312ad61dc44070530f46d09ba74 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/config/monit/conf.d/home" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/config/monit/conf.d/home" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/update" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/healthcheck" beforeDir="false" afterPath="$PROJECT_DIR$/bin/healthcheck" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/restart-logcat" beforeDir="false" afterPath="$PROJECT_DIR$/bin/restart-logcat" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/restarthome" beforeDir="false" afterPath="$PROJECT_DIR$/bin/restarthome" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/domoticz.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/hue.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/hue.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/insteon.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/squeezebox.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1299,7 +1307,9 @@
       <workItem from="1707238767637" duration="1470000" />
       <workItem from="1707311861067" duration="5052000" />
       <workItem from="1707323806669" duration="1110000" />
-      <workItem from="1708089220716" duration="1009000" />
+      <workItem from="1708089220716" duration="1619000" />
+      <workItem from="1708442844514" duration="418000" />
+      <workItem from="1709114228146" duration="2209000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1644,7 +1654,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="607" />
+    <option name="localTasksCounter" value="608" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/bin/healthcheck b/bin/healthcheck
index d5f126737f47ef17da346156abe5e1133cae923c..b7218ff3200d96b395d2823c96fd05001bd25d1b 100644 (file)
--- a/bin/healthcheck
+++ b/bin/healthcheck
@@ -2,7 +2,7 @@
 <?php
 require_once __DIR__ . "/../scripts/import.php";
 $heartbeats = ['cron', /*'logcats', 'logcatb',*/
-    'domoticz', 'hue', 'squeezebox'];
+    'hue', 'squeezebox'];
 
 $hasError = false;
 $mintime = INF;

diff --git a/bin/restart-logcat b/bin/restart-logcat
index b1c2ba12b7105548788ff43bf0a3dcac37ebc9fd..c16ce1a13d9b629a304f6855116e3541593b1792 100644 (file)
--- a/bin/restart-logcat
+++ b/bin/restart-logcat
@@ -1,4 +1,5 @@
 #!/bin/sh
+pkill -f adb
 /application/bin/adb-connect
 /application/servers/stopdaemon logcats
 /application/servers/stopdaemon logcatb

diff --git a/bin/restarthome b/bin/restarthome
index 8518a2709eff5fa291fa9f6abe61fa9b0726ab7a..59161274f8d360534957f9b95556570e25182abc 100644 (file)
--- a/bin/restarthome
+++ b/bin/restarthome
@@ -2,8 +2,6 @@
 sleep 1
 service atd restart
 sleep 3
-/application/servers/stopdaemon domoticz
-/application/servers/startdaemon domoticz
 /application/servers/stopdaemon cron
 /application/servers/startdaemon cron
 /application/servers/stopdaemon hue

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index 00adc6268f4e1d69d3c77c792074906deba49d10..0430033732b7f85a10506906c4871fe6e68f4332 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -81,13 +81,9 @@ function cronGuest($cronmin) {
        setState('guest', hasGuest() ? '1' : '0');
 }
 
-function cronInsteon($cronmin) {
-       _logSection('Insteon');
-       insteonCommand('knock');
-}
-
 function cronEcoMode($cronmin) {
        _logSection('Ecomode');
+    setState('cron_heartbeat', time());
        ecoMode(null, $cronmin % 15 === 0);
 }
 

diff --git a/servers/domoticz.php b/servers/domoticz.php
deleted file mode 100644 (file)
index eb17cd2..0000000
--- a/servers/domoticz.php
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/php
-
-<?php
-
-
-require_once __DIR__ . "/../scripts/import.php";
-
-// Set time limit to indefinite execution
-set_time_limit(0);
-ignore_user_abort(true);
-
-echo 'Run home server domoticz' . "\n";
-
-$redis = connectRedis();
-redisEventListener('domoticz_event', 'handleDomoticzQueue');
-handleDomoticzQueue();
-
-function handleDomoticzQueue()
-{
-    global $redis;
-
-    while (true) {
-        setState('domoticz_heartbeat', time());
-        $q = 'domoticz_queue';
-        $queue = $redis->igbget($q);
-        if (!is_array($queue)) {
-            $queue = [];
-            $redis->igbset($q, $queue);
-        }
-        if (!count($queue)) {
-            echo 'End processing queue' . "\n";
-            break;
-        }
-
-        $command = array_shift($queue);
-        $redis->igbset($q, $queue);
-        echo 'Run command ' . json_encode($command) . "\n";
-        runDomoticzCommand($command);
-        usleep(1000000 * 0.25);
-    }
-}
\ No newline at end of file

diff --git a/servers/hue.php b/servers/hue.php
index 23242fc23eec3cdb1ec8dec6a01c53783db1178b..4928f54211e2e8d89bf785f6c9c593ac0bbef3be 100644 (file)
--- a/servers/hue.php
+++ b/servers/hue.php
@@ -10,11 +10,10 @@ ignore_user_abort(true);
 echo 'Run hue server hue' . "\n";
 
 $redis = connectRedis();
-handleHueQueue();
-
 redisEventListener('hue_event', 'handleHueQueue');
+handleHueQueue(true);
 
-function handleHueQueue()
+function handleHueQueue($init = false)
 {
     global $redis;
 
@@ -29,6 +28,10 @@ function handleHueQueue()
 
         if (!count($queue)) {
             echo 'Queue empty ' . "\n";
+            if ($init) {
+                sleep(30);
+                continue;
+            }
             break;
         }
 
@@ -43,7 +46,7 @@ function handleHueQueue()
         echo 'Run command ' . json_encode($command) . "\n";
         try {
             _hueCommand($command);
-        }catch (Exception $e){
+        } catch (Exception $e) {
 
         }
         usleep(1000000 * 0.1);

diff --git a/servers/insteon.php b/servers/insteon.php
deleted file mode 100644 (file)
index 6693af9..0000000
--- a/servers/insteon.php
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/php
-
-<?php
-require_once __DIR__ . "/../scripts/import.php";
-
-// Set time limit to indefinite execution
-set_time_limit(0);
-ignore_user_abort(true);
-
-echo 'Run home server insteon' . "\n";
-
-$redis = connectRedis();
-handleInsteonQueue();
-
-redisEventListener('insteon_event', 'handleInsteonQueue');
-
-function handleInsteonQueue()
-{
-    global $redis;
-
-    while (true) {
-        $queue = $redis->igbget('insteon_queue');
-        if (!is_array($queue)) {
-            $queue = [];
-            $redis->igbset('insteon_queue', $queue);
-        }
-
-
-        if (!count($queue)) {
-            echo 'Queue empty ' . "\n";
-            break;
-        }
-
-        $queue = array_unique($queue);
-
-        echo 'Handle Queue : current state ' . json_encode($queue) . "\n";
-
-        $command = array_shift($queue);
-        $redis->igbset('insteon_queue', $queue);
-        echo 'Run command ' . $command . "\n";
-        if ($command == 'knock') {
-            insteonKnock();
-            continue;
-        }
-        runInsteonCommand($command);
-        usleep(1000000 * 0.5);
-    }
-    echo 'End of handling queue' . "\n";
-}
\ No newline at end of file

diff --git a/servers/squeezebox.php b/servers/squeezebox.php
index 60d11a3b3aa79ecfbe72c99a628c3c2d15b32d83..84c6688a2a03cc2cb5449dda6cd21929ce55d1e3 100644 (file)
--- a/servers/squeezebox.php
+++ b/servers/squeezebox.php
@@ -13,9 +13,9 @@ echo 'Run home server squeezebox' . "\n";
 
 $redis = connectRedis();
 redisEventListener('squeezebox_event', 'handleSqueezeboxQueue');
-handleSqueezeboxQueue();
+handleSqueezeboxQueue(true);
 
-function handleSqueezeboxQueue()
+function handleSqueezeboxQueue($init = false)
 {
     global $redis, $processingSqueezeboxQueue;
 
@@ -37,6 +37,10 @@ function handleSqueezeboxQueue()
         }
         if (!count($queue)) {
             echo 'End processing queue :)' . "\n";
+            if ($init) {
+                sleep(30);
+                continue;
+            }
             $processingSqueezeboxQueue = false;
             break;
         }