update Piwik to version 2.16 (fixes #91)
This commit is contained in:
oliver
parent
296343bf3b
commit
d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/**
|
||||
* Piwik - Open source web analytics
|
||||
* Piwik - free/libre analytics platform
|
||||
*
|
||||
* @link http://piwik.org
|
||||
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
*/
|
||||
namespace Piwik\CronArchive;
|
||||
|
||||
use Piwik\CronArchive;
|
||||
|
||||
class FixedSiteIds
|
||||
{
|
||||
|
|
@ -63,6 +62,4 @@ class FixedSiteIds
|
|||
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,208 @@
|
|||
<?php
|
||||
/**
|
||||
* Piwik - free/libre analytics platform
|
||||
*
|
||||
* @link http://piwik.org
|
||||
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
|
||||
*/
|
||||
namespace Piwik\CronArchive;
|
||||
|
||||
use Piwik\Cache\Cache;
|
||||
use Piwik\Cache\Transient;
|
||||
use Piwik\Container\StaticContainer;
|
||||
use Piwik\Date;
|
||||
use Piwik\Period\Factory as PeriodFactory;
|
||||
use Piwik\Period\Range;
|
||||
use Piwik\Plugins\SegmentEditor\Model;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
* Provides URLs that initiate archiving during cron archiving for segments.
|
||||
*
|
||||
* Handles the `[General] process_new_segments_from` INI option.
|
||||
*/
|
||||
class SegmentArchivingRequestUrlProvider
|
||||
{
|
||||
const BEGINNING_OF_TIME = 'beginning_of_time';
|
||||
const CREATION_TIME = 'segment_creation_time';
|
||||
const LAST_EDIT_TIME = 'segment_last_edit_time';
|
||||
|
||||
/**
|
||||
* @var Model
|
||||
*/
|
||||
private $segmentEditorModel;
|
||||
|
||||
/**
|
||||
* @var Cache
|
||||
*/
|
||||
private $segmentListCache;
|
||||
|
||||
/**
|
||||
* @var Date
|
||||
*/
|
||||
private $now;
|
||||
|
||||
private $processNewSegmentsFrom;
|
||||
|
||||
/**
|
||||
* @var LoggerInterface
|
||||
*/
|
||||
private $logger;
|
||||
|
||||
public function __construct($processNewSegmentsFrom, Model $segmentEditorModel = null, Cache $segmentListCache = null,
|
||||
Date $now = null, LoggerInterface $logger = null)
|
||||
{
|
||||
$this->processNewSegmentsFrom = $processNewSegmentsFrom;
|
||||
$this->segmentEditorModel = $segmentEditorModel ?: new Model();
|
||||
$this->segmentListCache = $segmentListCache ?: new Transient();
|
||||
$this->now = $now ?: Date::factory('now');
|
||||
$this->logger = $logger ?: StaticContainer::get('Psr\Log\LoggerInterface');
|
||||
}
|
||||
|
||||
public function getUrlParameterDateString($idSite, $period, $date, $segment)
|
||||
{
|
||||
$oldestDateToProcessForNewSegment = $this->getOldestDateToProcessForNewSegment($idSite, $segment);
|
||||
if (empty($oldestDateToProcessForNewSegment)) {
|
||||
return $date;
|
||||
}
|
||||
|
||||
// if the start date for the archiving request is before the minimum date allowed for processing this segment,
|
||||
// use the minimum allowed date as the start date
|
||||
$periodObj = PeriodFactory::build($period, $date);
|
||||
if ($periodObj->getDateStart()->getTimestamp() < $oldestDateToProcessForNewSegment->getTimestamp()) {
|
||||
$this->logger->debug("Start date of archiving request period ({start}) is older than configured oldest date to process for the segment.", array(
|
||||
'start' => $periodObj->getDateStart()
|
||||
));
|
||||
|
||||
$endDate = $periodObj->getDateEnd();
|
||||
|
||||
// if the creation time of a segment is older than the end date of the archiving request range, we cannot
|
||||
// blindly rewrite the date string, since the resulting range would be incorrect. instead we make the
|
||||
// start date equal to the end date, so less archiving occurs, and no fatal error occurs.
|
||||
if ($oldestDateToProcessForNewSegment->getTimestamp() > $endDate->getTimestamp()) {
|
||||
$this->logger->debug("Oldest date to process is greater than end date of archiving request period ({end}), so setting oldest date to end date.", array(
|
||||
'end' => $endDate
|
||||
));
|
||||
|
||||
$oldestDateToProcessForNewSegment = $endDate;
|
||||
}
|
||||
|
||||
$date = $oldestDateToProcessForNewSegment->toString().','.$endDate;
|
||||
|
||||
$this->logger->debug("Archiving request date range changed to {date} w/ period {period}.", array('date' => $date, 'period' => $period));
|
||||
}
|
||||
|
||||
return $date;
|
||||
}
|
||||
|
||||
private function getOldestDateToProcessForNewSegment($idSite, $segment)
|
||||
{
|
||||
/**
|
||||
* @var Date $segmentCreatedTime
|
||||
* @var Date $segmentLastEditedTime
|
||||
*/
|
||||
list($segmentCreatedTime, $segmentLastEditedTime) = $this->getCreatedTimeOfSegment($idSite, $segment);
|
||||
|
||||
if ($this->processNewSegmentsFrom == self::CREATION_TIME) {
|
||||
$this->logger->debug("process_new_segments_from set to segment_creation_time, oldest date to process is {time}", array('time' => $segmentCreatedTime));
|
||||
|
||||
return $segmentCreatedTime;
|
||||
} elseif ($this->processNewSegmentsFrom == self::LAST_EDIT_TIME) {
|
||||
$this->logger->debug("process_new_segments_from set to segment_last_edit_time, segment last edit time is {time}",
|
||||
array('time' => $segmentLastEditedTime));
|
||||
|
||||
if ($segmentLastEditedTime === null
|
||||
|| $segmentLastEditedTime->getTimestamp() < $segmentCreatedTime->getTimestamp()
|
||||
) {
|
||||
$this->logger->debug("segment last edit time is older than created time, using created time instead");
|
||||
|
||||
$segmentLastEditedTime = $segmentCreatedTime;
|
||||
}
|
||||
|
||||
return $segmentLastEditedTime;
|
||||
} elseif (preg_match("/^last([0-9]+)$/", $this->processNewSegmentsFrom, $matches)) {
|
||||
$lastN = $matches[1];
|
||||
|
||||
list($lastDate, $lastPeriod) = Range::getDateXPeriodsAgo($lastN, $segmentCreatedTime, 'day');
|
||||
$result = Date::factory($lastDate);
|
||||
|
||||
$this->logger->debug("process_new_segments_from set to last{N}, oldest date to process is {time}", array('N' => $lastN, 'time' => $result));
|
||||
|
||||
return $result;
|
||||
} else {
|
||||
$this->logger->debug("process_new_segments_from set to beginning_of_time or cannot recognize value");
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private function getCreatedTimeOfSegment($idSite, $segmentDefinition)
|
||||
{
|
||||
$segments = $this->getAllSegments();
|
||||
|
||||
/** @var Date $latestEditTime */
|
||||
$latestEditTime = null;
|
||||
$earliestCreatedTime = $this->now;
|
||||
foreach ($segments as $segment) {
|
||||
if (empty($segment['ts_created'])
|
||||
|| empty($segment['definition'])
|
||||
|| !isset($segment['enable_only_idsite'])
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($this->isSegmentForSite($segment, $idSite)
|
||||
&& $segment['definition'] == $segmentDefinition
|
||||
) {
|
||||
// check for an earlier ts_created timestamp
|
||||
$createdTime = Date::factory($segment['ts_created']);
|
||||
if ($createdTime->getTimestamp() < $earliestCreatedTime->getTimestamp()) {
|
||||
$earliestCreatedTime = $createdTime;
|
||||
}
|
||||
|
||||
// if there is no ts_last_edit timestamp, initialize it to ts_created
|
||||
if (empty($segment['ts_last_edit'])) {
|
||||
$segment['ts_last_edit'] = $segment['ts_created'];
|
||||
}
|
||||
|
||||
// check for a later ts_last_edit timestamp
|
||||
$lastEditTime = Date::factory($segment['ts_last_edit']);
|
||||
if ($latestEditTime === null
|
||||
|| $latestEditTime->getTimestamp() < $lastEditTime->getTimestamp()
|
||||
) {
|
||||
$latestEditTime = $lastEditTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->logger->debug(
|
||||
"Earliest created time of segment '{segment}' w/ idSite = {idSite} is found to be {createdTime}. Latest " .
|
||||
"edit time is found to be {latestEditTime}.",
|
||||
array(
|
||||
'segment' => $segmentDefinition,
|
||||
'idSite' => $idSite,
|
||||
'createdTime' => $earliestCreatedTime,
|
||||
'latestEditTime' => $latestEditTime,
|
||||
)
|
||||
);
|
||||
|
||||
return array($earliestCreatedTime, $latestEditTime);
|
||||
}
|
||||
|
||||
private function getAllSegments()
|
||||
{
|
||||
if (!$this->segmentListCache->contains('all')) {
|
||||
$segments = $this->segmentEditorModel->getAllSegmentsAndIgnoreVisibility();
|
||||
|
||||
$this->segmentListCache->save('all', $segments);
|
||||
}
|
||||
|
||||
return $this->segmentListCache->fetch('all');
|
||||
}
|
||||
|
||||
private function isSegmentForSite($segment, $idSite)
|
||||
{
|
||||
return $segment['enable_only_idsite'] == 0
|
||||
|| $segment['enable_only_idsite'] == $idSite;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/**
|
||||
* Piwik - Open source web analytics
|
||||
* Piwik - free/libre analytics platform
|
||||
*
|
||||
* @link http://piwik.org
|
||||
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
|
||||
|
|
@ -18,12 +18,22 @@ use Piwik\Option;
|
|||
*/
|
||||
class SharedSiteIds
|
||||
{
|
||||
const OPTION_DEFAULT = 'SharedSiteIdsToArchive';
|
||||
const OPTION_ALL_WEBSITES = 'SharedSiteIdsToArchive_AllWebsites';
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
private $optionName;
|
||||
|
||||
private $siteIds = array();
|
||||
private $currentSiteId;
|
||||
private $done = false;
|
||||
|
||||
public function __construct($websiteIds)
|
||||
public function __construct($websiteIds, $optionName = self::OPTION_DEFAULT)
|
||||
{
|
||||
$this->optionName = $optionName;
|
||||
|
||||
if (empty($websiteIds)) {
|
||||
$websiteIds = array();
|
||||
}
|
||||
|
|
@ -86,16 +96,16 @@ class SharedSiteIds
|
|||
public function setSiteIdsToArchive($siteIds)
|
||||
{
|
||||
if (!empty($siteIds)) {
|
||||
Option::set('SharedSiteIdsToArchive', implode(',', $siteIds));
|
||||
Option::set($this->optionName, implode(',', $siteIds));
|
||||
} else {
|
||||
Option::delete('SharedSiteIdsToArchive');
|
||||
Option::delete($this->optionName);
|
||||
}
|
||||
}
|
||||
|
||||
public function getAllSiteIdsToArchive()
|
||||
{
|
||||
Option::clearCachedOption('SharedSiteIdsToArchive');
|
||||
$siteIdsToArchive = Option::get('SharedSiteIdsToArchive');
|
||||
Option::clearCachedOption($this->optionName);
|
||||
$siteIdsToArchive = Option::get($this->optionName);
|
||||
|
||||
if (empty($siteIdsToArchive)) {
|
||||
return array();
|
||||
|
|
@ -171,6 +181,4 @@ class SharedSiteIds
|
|||
{
|
||||
return Process::isSupported();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
<?php
|
||||
/**
|
||||
* Piwik - free/libre analytics platform
|
||||
*
|
||||
* @link http://piwik.org
|
||||
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
|
||||
*
|
||||
*/
|
||||
namespace Piwik\CronArchive;
|
||||
|
||||
use Piwik\Concurrency\DistributedList;
|
||||
|
||||
/**
|
||||
* Distributed list that stores the list of IDs of sites whose archives should be reprocessed.
|
||||
*
|
||||
* CronArchive will read this list of sites when archiving is being run, and make sure the sites
|
||||
* are re-archived.
|
||||
*
|
||||
* Any class/API method/command/etc. is allowed to add site IDs to this list.
|
||||
*/
|
||||
class SitesToReprocessDistributedList extends DistributedList
|
||||
{
|
||||
const OPTION_INVALIDATED_IDSITES_TO_REPROCESS = 'InvalidatedOldReports_WebsiteIds';
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct(self::OPTION_INVALIDATED_IDSITES_TO_REPROCESS);
|
||||
}
|
||||
|
||||
/**
|
||||
* @inheritdoc
|
||||
*/
|
||||
public function setAll($items)
|
||||
{
|
||||
$items = array_unique($items, SORT_REGULAR);
|
||||
$items = array_values($items);
|
||||
|
||||
parent::setAll($items);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue