Simplify configuration file structure

This removes most of the legacy upstream config madness by not using
weird config files spread all over the place.

This isn't the solution to other config reading fragility issues, but
it does move the whole config back to the central airtime.conf file.
This commit is contained in:
Lucas Bickel 2017-07-18 22:27:19 +02:00
parent 320b128ad8
commit fa2018a2c5
14 changed files with 46 additions and 106 deletions

View file

@ -51,10 +51,6 @@ class RabbitMQSetup extends Setup {
$this->identifyRMQConnectionError();
}
if (count(self::$errors) <= 0) {
$this->writeToTemp();
}
return array(
"message" => self::$message,
"errors" => self::$errors
@ -81,13 +77,4 @@ class RabbitMQSetup extends Setup {
self::$errors[] = self::RMQ_PORT;
self::$errors[] = self::RMQ_VHOST;
}
protected function writeToTemp() {
if (!file_exists(RMQ_INI_TEMP_PATH)) {
copy(BUILD_PATH . "rabbitmq-analyzer.ini", RMQ_INI_TEMP_PATH);
}
$this->_write(RMQ_INI_TEMP_PATH);
parent::writeToTemp();
}
}
}