[IM] Only display a message is we are filtering and then display the …

…appropriate message(s)
listerr · Dec 15, 2014 · 54950b7 · 54950b7
1 parent 1f7bda6
commit 54950b7
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/application/modules/apiv1/controllers/RouterController.php b/application/modules/apiv1/controllers/RouterController.php
@@ -117,12 +117,21 @@ public function serverConfAction()
             $this->view->irrdbAsns     = $this->getD2R( '\\Entities\\IrrdbAsn'    )->getForCustomerAndProtocol( $int[ 'cid' ], $proto );
             $this->view->asnsProcessed = $asnsProcessed;
 
-            // some sanity checks
-            if( !count( $this->view->prefixes ) && !count( $this->view->irrdbAsns ) )
-                $this->getLogger()->alert( sprintf( "WARNING: no prefixes and ASNs found for %s/IPv%d in route server config generation",
+            // some sanity warnings
+            if( $int['irrdbfilter'] && ( !count( $this->view->prefixes ) || !count( $this->view->irrdbAsns ) ) ) {
+                if( !count( $this->view->prefixes ) ) {
+                    $this->getLogger()->alert( sprintf( "WARNING: no prefixes found for %s/IPv%d in route server config generation",
                     $int['cname'], $proto
-                ) );
+                    ) );
+                }
 
+                if( !count( $this->view->irrdbAsns ) ) {
+                    $this->getLogger()->alert( sprintf( "WARNING: no ASNs found for %s/IPv%d in route server config generation",
+                    $int['cname'], $proto
+                    ) );
+                }
+            }
+
             echo $this->view->render( "router-cli/server/{$target}/neighbor.cfg" );
             $asnsProcessed[] = $int['autsys'];
         }