@@ -1498,19 +1498,22 @@ bool AclTable::add(shared_ptr<AclRule> newRule)
1498
1498
if (ruleIter->second ->remove ())
1499
1499
{
1500
1500
rules.erase (ruleIter);
1501
- SWSS_LOG_NOTICE (" Successfully deleted ACL rule: %s" , rule_id.c_str ());
1501
+ SWSS_LOG_NOTICE (" Successfully deleted ACL rule %s in table %s" ,
1502
+ rule_id.c_str (), id.c_str ());
1502
1503
}
1503
1504
}
1504
1505
1505
1506
if (newRule->create ())
1506
1507
{
1507
1508
rules[rule_id] = newRule;
1508
- SWSS_LOG_NOTICE (" Successfully created ACL rule %s in table %s" , rule_id.c_str (), id.c_str ());
1509
+ SWSS_LOG_NOTICE (" Successfully created ACL rule %s in table %s" ,
1510
+ rule_id.c_str (), id.c_str ());
1509
1511
return true ;
1510
1512
}
1511
1513
else
1512
1514
{
1513
- SWSS_LOG_ERROR (" Failed to create rule in table %s" , id.c_str ());
1515
+ SWSS_LOG_ERROR (" Failed to create ACL rule %s in table %s" ,
1516
+ rule_id.c_str (), id.c_str ());
1514
1517
return false ;
1515
1518
}
1516
1519
}
@@ -1525,18 +1528,21 @@ bool AclTable::remove(string rule_id)
1525
1528
if (ruleIter->second ->remove ())
1526
1529
{
1527
1530
rules.erase (ruleIter);
1528
- SWSS_LOG_NOTICE (" Successfully deleted ACL rule %s" , rule_id.c_str ());
1531
+ SWSS_LOG_NOTICE (" Successfully deleted ACL rule %s in table %s" ,
1532
+ rule_id.c_str (), id.c_str ());
1529
1533
return true ;
1530
1534
}
1531
1535
else
1532
1536
{
1533
- SWSS_LOG_ERROR (" Failed to delete ACL rule: %s" , rule_id.c_str ());
1537
+ SWSS_LOG_ERROR (" Failed to delete ACL rule %s in table %s" ,
1538
+ rule_id.c_str (), id.c_str ());
1534
1539
return false ;
1535
1540
}
1536
1541
}
1537
1542
else
1538
1543
{
1539
- SWSS_LOG_WARN (" Skip deleting ACL rule. Unknown rule %s" , rule_id.c_str ());
1544
+ SWSS_LOG_WARN (" Skip deleting unknown ACL rule %s in table %s" ,
1545
+ rule_id.c_str (), id.c_str ());
1540
1546
return true ;
1541
1547
}
1542
1548
}
@@ -1551,7 +1557,8 @@ bool AclTable::clear()
1551
1557
bool suc = rule.remove ();
1552
1558
if (!suc)
1553
1559
{
1554
- SWSS_LOG_ERROR (" Failed to delete existing ACL rule %s when removing the ACL table %s" , rule.getId ().c_str (), id.c_str ());
1560
+ SWSS_LOG_ERROR (" Failed to delete ACL rule %s when removing the ACL table %s" ,
1561
+ rule.getId ().c_str (), id.c_str ());
1555
1562
return false ;
1556
1563
}
1557
1564
}
0 commit comments