Move deadlock info logging to Db.php, fix core updater translation regression, fix core updater css regression, change logger_message level column to string, and delete unneeded logger tables if not empty. Also includes some changes to travis build.

1 files changed, 1 insertions, 9 deletions

diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index deae286948..e29d7eed6c 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -127,15 +127,7 @@ class ArchiveWriter
 								'" . $date . "',
 								0 "
             . " FROM $numericTable as tb1";
-        try { // TODO: this is temporary, remove when deadlocking issue is fixed
-            Db::get()->exec($insertSql);
-        } catch (Exception $ex) {
-            if (Db::get()->isErrNo($ex, 1213)) {
-                $deadlockInfo = \Piwik\Db::fetchAll("SHOW ENGINE INNODB STATUS");
-                Log::debug("DEADLOCK INFO: " . print_r($deadlockInfo));
-            }
-            throw $ex;
-        }
+        Db::get()->exec($insertSql);
         $this->releaseArchiveTableLock();
         $selectIdSql = "SELECT idarchive FROM $numericTable WHERE name = ? LIMIT 1";
         $id = Db::get()->fetchOne($selectIdSql, $locked);