class-Address/ServiceGroup - move from error to warning if own Group …

…is included as member
swaschkut · Jun 11, 2018 · 9c83691 · 9c83691
1 parent ae04052
commit 9c83691
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -32,7 +32,7 @@ bugfix:
 - fix service-edit actions=move - problem with API mode for TMP objects
 - fix class AddressRuleContainer - fix is related address-merger for snathost replacement
 - fix memory calculation for specific situations
-- fix memory issue if own addressgroup/servicegroup is added as a subgroup in an offline configuration file
+- fix memory issue if own addressgroup/servicegroup is added as a subgroup in an offline configuration file (move from error to warning)
 
 
 

diff --git a/lib/object-classes/class-AddressGroup.php b/lib/object-classes/class-AddressGroup.php
@@ -664,7 +664,10 @@ public function & expand($keepGroupsInList=false)
             if( $object->isGroup() )
             {
                 if( $this->name() == $object->name() )
-                    derr( "please cleanup your configuration file, addressgroup with name: ".$this->name()." is added as subgroup!!!" );
+                {
+                    mwarning( "addressgroup with name: ".$this->name()." is added as subgroup to itself, you should review your XML config file" );
+                    continue;
+                }
 
                 /** @var AddressGroup $object */
                 $tmpList = $object->expand();

diff --git a/lib/object-classes/class-ServiceGroup.php b/lib/object-classes/class-ServiceGroup.php
@@ -572,7 +572,11 @@ public function &expand($keepGroupsInList=false)
 			if( $object->isGroup() )
 			{
                 if( $this->name() == $object->name() )
-                    derr( "please cleanup your configuration file, servicegroup with name: ".$this->name()." is added as subgroup!!!" );
+                {
+                    mwarning( "servicegroup with name: ".$this->name()." is added as subgroup to itself, you should review your XML config file" );
+                    continue;
+                }
+
 
 				$ret = array_merge( $ret, $object->expand() );
                 if( $keepGroupsInList )

diff --git a/utils/common/actions-address.php b/utils/common/actions-address.php
@@ -710,7 +710,7 @@
 
 );
 
-//TODO: does not use the filtered objects 20180202
+
 AddressCallContext::$supportedActions[] = Array(
     'name' => 'replaceByMembersAndDelete',
     'MainFunction' => function ( AddressCallContext $context )