tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-30 17:24:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

IcingaVar: use new CustomVar helpers

Browse Source
This commit is contained in:
Thomas Gelf 2016-12-07 08:29:20 +01:00
parent 87bd531f2a
commit 2ea573e338
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/Director/Objects/IcingaVar.php
View File

@ -32,7 +32,7 @@ class IcingaVar extends DbObject
*/ */
public static function forCustomVar(CustomVariable $customVar, Db $db) public static function forCustomVar(CustomVariable $customVar, Db $db)
{ {
$rendered = static::renderVar($customVar); $rendered = $customVar->render();
$var = static::create(array( $var = static::create(array(
'checksum' => $customVar->checksum(), 'checksum' => $customVar->checksum(),
@ -47,24 +47,6 @@ class IcingaVar extends DbObject
return $var; return $var;
} }
protected static function renderVar(CustomVariable $var)
{
$renderExpressions = false; // TODO!
return c::renderKeyValue(
static::renderKeyName($var->getKey()),
$var->toConfigStringPrefetchable($renderExpressions)
);
}
protected static function renderKeyName($key)
{
if (preg_match('/^[a-z0-9_]+\d*$/i', $key)) {
return 'vars.' . c::escapeIfReserved($key);
} else {
return 'vars[' . c::renderString($key) . ']';
}
}
/** /**
* @param CustomVariable $var * @param CustomVariable $var
* @param Db $db * @param Db $db