Change filter of expected SQL errors

Filter out "SQLSTATE Class code 23: Constraint Violation" because of
expected duplicate entries.
Consider adding a Minz_Log::DEBUG level

2 files changed, 5 insertions, 5 deletions

diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index 7a6cfe4f3..18a46f322 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -162,10 +162,8 @@ class feedController extends ActionController {
 				$feedDAO->updateLastUpdate ($feed->id ());
 				$flux_update++;
 			} catch (FeedException $e) {
-				if (strpos($e->getMessage (), 'Duplicate entry') === false) {	//Filter out expected duplicate entries	//TODO: Optimize to avoid try/catch exception
-					Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
-					$feedDAO->isInError ($feed->id ());
-				}
+				Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
+				$feedDAO->isInError ($feed->id ());
 			}
 
 			// On arrête à 10 flux pour ne pas surcharger le serveur
diff --git a/app/models/Entry.php b/app/models/Entry.php
index c247c6362..d5a150bb1 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -216,7 +216,9 @@ class EntryDAO extends Model_pdo {
 			return true;
 		} else {
 			$info = $stm->errorInfo();
-			Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::NOTICE);
+			if ((int)($info[0] / 1000) !== 23) {	//Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries
+				Minz_Log::record ('SQL error ' . $info[0] . ': ' . $info[1] . ' ' . $info[2], Minz_Log::NOTICE);	//TODO: Consider adding a Minz_Log::DEBUG level
+			}
 			return false;
 		}
 	}