diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2020-08-26 05:04:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-26 05:04:17 +0300 |
| commit | 40c564a1ab04fc953ec7032be4432710fae33a7a (patch) | |
| tree | d3be9ef5239a7d90749119c940c8ceb8bc96c007 /core | |
| parent | bace4f5fc21b0b6c18045943f9bb7d1c5dbe1ce6 (diff) | |
Tweaks for archiving for enterprise demo. (#16346)
Diffstat (limited to 'core')
| -rw-r--r-- | core/CronArchive.php | 6 | ||||
| -rw-r--r-- | core/DataAccess/Model.php | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/core/CronArchive.php b/core/CronArchive.php index 1dd1265070..dd4e39c29e 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -746,7 +746,11 @@ class CronArchive $this->logger->info(' Will invalidate archived reports for ' . $date . ' for following websites ids: ' . $listSiteIds); $this->getApiToInvalidateArchivedReport()->invalidateArchivedReports($siteIdsToInvalidate, $date); } catch (Exception $e) { - $this->logger->info(' Failed to invalidate archived reports: ' . $e->getMessage()); + $message = $e->getMessage(); + if (\Piwik_ShouldPrintBackTraceWithMessage()) { + $message .= "\n" . $e->getTraceAsString(); + } + $this->logger->info(' Failed to invalidate archived reports: ' . $message); } } diff --git a/core/DataAccess/Model.php b/core/DataAccess/Model.php index 6faaeb05ed..a06e488696 100644 --- a/core/DataAccess/Model.php +++ b/core/DataAccess/Model.php @@ -203,7 +203,13 @@ class Model $dummyArchives = []; foreach ($idSites as $idSite) { - $siteCreationTime = Date::factory(Site::getCreationDateFor($idSite)); + try { + $siteCreationTime = Site::getCreationDateFor($idSite); + } catch (\Exception $ex) { + continue; + } + + $siteCreationTime = Date::factory($siteCreationTime); foreach ($allPeriodsToInvalidate as $period) { if ($period->getLabel() == 'range' && !$forceInvalidateNonexistantRanges |