From fc117217ddececb3138be8a7afd3e098fda1bbed Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Wed, 11 Jan 2017 15:56:51 +0100 Subject: [PATCH] Storage: cosmetics --- .../Businessprocess/Storage/LegacyConfigParser.php | 14 +++++++++++++- .../Storage/LegacyConfigRenderer.php | 2 +- library/Businessprocess/Storage/LegacyStorage.php | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/library/Businessprocess/Storage/LegacyConfigParser.php b/library/Businessprocess/Storage/LegacyConfigParser.php index c49b627..a93ead2 100644 --- a/library/Businessprocess/Storage/LegacyConfigParser.php +++ b/library/Businessprocess/Storage/LegacyConfigParser.php @@ -5,8 +5,8 @@ namespace Icinga\Module\Businessprocess\Storage; use Icinga\Application\Benchmark; use Icinga\Exception\ConfigurationError; use Icinga\Exception\SystemPermissionException; -use Icinga\Module\Businessprocess\BpNode; use Icinga\Module\Businessprocess\BpConfig; +use Icinga\Module\Businessprocess\BpNode; use Icinga\Module\Businessprocess\Metadata; class LegacyConfigParser @@ -42,6 +42,12 @@ class LegacyConfigParser return $this->config; } + /** + * @param $name + * @param $filename + * + * @return BpConfig + */ public static function parseFile($name, $filename) { Benchmark::measure('Loading business process ' . $name); @@ -51,6 +57,12 @@ class LegacyConfigParser return $parser->getParsedConfig(); } + /** + * @param $name + * @param $string + * + * @return BpConfig + */ public static function parseString($name, $string) { Benchmark::measure('Loading BP config from file: ' . $name); diff --git a/library/Businessprocess/Storage/LegacyConfigRenderer.php b/library/Businessprocess/Storage/LegacyConfigRenderer.php index 4bb7e18..1553221 100644 --- a/library/Businessprocess/Storage/LegacyConfigRenderer.php +++ b/library/Businessprocess/Storage/LegacyConfigRenderer.php @@ -51,7 +51,7 @@ class LegacyConfigRenderer continue; } - $str .= sprintf("# %-11s : %s\n", $key, $value); + $str .= sprintf("# %-15s : %s\n", $key, $value); } $str .= "#\n###################################\n\n"; diff --git a/library/Businessprocess/Storage/LegacyStorage.php b/library/Businessprocess/Storage/LegacyStorage.php index 2c65347..8cbe89b 100644 --- a/library/Businessprocess/Storage/LegacyStorage.php +++ b/library/Businessprocess/Storage/LegacyStorage.php @@ -162,6 +162,12 @@ class LegacyStorage extends Storage return $this->getConfigDir() . '/' . $name . '.conf'; } + /** + * @param $name + * @param $string + * + * @return BpConfig + */ public function loadFromString($name, $string) { return LegacyConfigParser::parseString($name, $string);