Allow Negating Categories in CLogRoutes

joshrp · Sep 11, 2012 · dc89ce3 · dc89ce3
1 parent bfd756f
commit dc89ce3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/framework/logging/CLogRoute.php b/framework/logging/CLogRoute.php
@@ -40,6 +40,7 @@ abstract class CLogRoute extends CComponent
 	public $levels='';
 	/**
 	 * @var string list of categories separated by comma or space. Defaults to empty, meaning all categories.
+	 * Allows negating categories, use ! before a category name to not include it.
 	 */
 	public $categories='';
 	/**

diff --git a/framework/logging/CLogger.php b/framework/logging/CLogger.php
@@ -149,13 +149,20 @@ public function getLogs($levels='',$categories='')
 	 */
 	private function filterByCategory($value)
 	{
+		$cat=strtolower($value[2]);
+		$negateOnly=true;
 		foreach($this->_categories as $category)
 		{
-			$cat=strtolower($value[2]);
+			if (substr($category, 0,1) === '!')
+				$category = substr($category,1);
+			else
+				$negateOnly = false;
+
 			if($cat===$category || (($c=rtrim($category,'.*'))!==$category && strpos($cat,$c)===0))
-				return true;
+				return !$negateOnly;
+
 		}
-		return false;
+		return $negateOnly;
 	}
 
 	/**