From 6a65a7f3f102e0ef58e397babef86d5cca45bed8 Mon Sep 17 00:00:00 2001
From: Jonas L <jooola@users.noreply.github.com>
Date: Mon, 9 May 2022 13:21:17 +0200
Subject: [PATCH] feat(legacy): improve rabbitmq check (#1839)

---
 legacy/build/airtime-setup/load.php | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/legacy/build/airtime-setup/load.php b/legacy/build/airtime-setup/load.php
index 4502274b5..7c2ffb8c6 100644
--- a/legacy/build/airtime-setup/load.php
+++ b/legacy/build/airtime-setup/load.php
@@ -1,7 +1,5 @@
 <?php
 
-define('RMQ_INI_SECTION', 'rabbitmq');
-
 function booleanReduce($a, $b)
 {
     return $a && $b;
@@ -102,19 +100,14 @@ function configureDatabase()
  */
 function checkRMQConnection()
 {
-    // Check for installed config file first, then check in the build directory,
-    if (file_exists(LIBRETIME_CONFIG_FILEPATH)) {
-        $ini = parse_ini_file(LIBRETIME_CONFIG_FILEPATH, true);
-    } else {
-        $ini = parse_ini_file(SAMPLE_CONFIG_FILEPATH, true);
-    }
+    $config = Config::getConfig();
 
     $conn = new \PhpAmqpLib\Connection\AMQPStreamConnection(
-        $ini[RMQ_INI_SECTION]['host'],
-        $ini[RMQ_INI_SECTION]['port'],
-        $ini[RMQ_INI_SECTION]['user'],
-        $ini[RMQ_INI_SECTION]['password'],
-        $ini[RMQ_INI_SECTION]['vhost']
+        $config['rabbitmq']['host'],
+        $config['rabbitmq']['port'],
+        $config['rabbitmq']['user'],
+        $config['rabbitmq']['password'],
+        $config['rabbitmq']['vhost']
     );
 
     return isset($conn);