diff --git a/core/class/Abeille.class.php b/core/class/Abeille.class.php index b12889c38..2e6ec1a38 100644 --- a/core/class/Abeille.class.php +++ b/core/class/Abeille.class.php @@ -2623,6 +2623,7 @@ public static function msgToCmd($priority, $topic, $payload = "") { - To update from JSON (identical to re-inclusion) => action = 'update' - To force a different model than the one auto-detected => action = 'update' */ + // WARNING: This CAN'T be moved in 'AbeilleMainD.php' as it is used by 'install.php'too public static function createDevice($action, $dev) { log::add('Abeille', 'debug', ' createDevice('.$action.', dev='.json_encode($dev, JSON_UNESCAPED_SLASHES)); @@ -3263,21 +3264,21 @@ public static function createDevice($action, $dev) { Abeille::msgToParser($msg); } // End createDevice() - // public static function msgToParser($msg) { - // global $abQueues; - // $queue = msg_get_queue($abQueues['xToParser']['id']); - // $msgJson = json_encode($msg, JSON_UNESCAPED_SLASHES); - // msg_send($queue, 1, $msgJson, false, false); - // log::add('Abeille', 'debug', " Msg to Parser: ".$msgJson); - // } + public static function msgToParser($msg) { + global $abQueues; + $queue = msg_get_queue($abQueues['xToParser']['id']); + $msgJson = json_encode($msg, JSON_UNESCAPED_SLASHES); + msg_send($queue, 1, $msgJson, false, false); + log::add('Abeille', 'debug', " Msg to Parser: ".$msgJson); + } - // public static function msgToCmd2($msg) { - // global $abQueues; - // $queue = msg_get_queue($abQueues['xToCmd']['id']); - // $msgJson = json_encode($msg, JSON_UNESCAPED_SLASHES); - // msg_send($queue, 1, $msgJson, false, false); - // log::add('Abeille', 'debug', " Msg to Cmd: ".$msgJson); - // } + public static function msgToCmd2($msg) { + global $abQueues; + $queue = msg_get_queue($abQueues['xToCmd']['id']); + $msgJson = json_encode($msg, JSON_UNESCAPED_SLASHES); + msg_send($queue, 1, $msgJson, false, false); + log::add('Abeille', 'debug', " Msg to Cmd: ".$msgJson); + } // /* Update all infos related to last communication time & LQI of given device. // This is based on timestamp of last communication received from device itself. */ diff --git a/docs/fr_FR/Changelog.md b/docs/fr_FR/Changelog.md index 5d644edc8..adedaf4c8 100644 --- a/docs/fr_FR/Changelog.md +++ b/docs/fr_FR/Changelog.md @@ -1,6 +1,6 @@ # ChangeLog -- Correction: AbeilleMainD +- Corrections: Regression AbeilleMainD + Abeille.class ## 250128-BETA-2, ## 250128-BETA-1