Skip to content

During core:archive when a day or period archiving fails for a website, abort the website archiving #12708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Do not run the same archive command twice
merged 8 commits into from
Apr 9, 2018
Merged

During core:archive when a day or period archiving fails for a website, abort the website archiving #12708

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
72f133c
Merge pull request #12333 from piwik/3.x-dev
mattab Dec 6, 2017
c8405dc
Merge pull request #12427 from matomo-org/3.x-dev
mattab Jan 11, 2018
19a7654
visitorGeolocator: output actual changes in debug mode (#12478)
lwille Jan 18, 2018
6f2c085
Revert "visitorGeolocator: output actual changes in debug mode (#1247…
mattab Jan 18, 2018
4421518
Merge pull request #12661 from matomo-org/3.x-dev
mattab Mar 28, 2018
9597063
Merge remote-tracking branch 'origin/master' into archivenottwice
mattab Apr 9, 2018
91378d6
If one of the period archiving fails, we now cancel the remaining arc…
mattab Apr 9, 2018
cf3dafc
Increment the skipped counter
mattab Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "visitorGeolocator: output actual changes in debug mode (#12478)… 
…" (#12480)

This reverts commit 19a7654.
  • Loading branch information
@mattab
mattab authored Jan 18, 2018
commit 6f2c0857083f4d84c24a5c655cdebcb502d2a56a
4 changes: 2 additions & 2 deletions plugins/UserCountry/VisitorGeolocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public function attributeExistingVisit($visit, $useClassCache = true)
$this->logger->debug('Updating visit with idvisit = {idVisit} (IP = {ip}). Changes: {changes}', array(
'idVisit' => $idVisit,
'ip' => $ip,
'changes' => json_encode($valuesToUpdate)
'changes' => $valuesToUpdate
));

$this->dao->updateVisits($valuesToUpdate, $idVisit);
Expand Down Expand Up @@ -309,4 +309,4 @@ public static function getDefaultLocationCache()
}
return self::$defaultLocationCache;
}
}
}