From 8a23b7e718ed107abeba1efbfbfbdd2d6b9ab58e Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Mon, 4 Sep 2017 17:02:11 +1200 Subject: Allow different reports pre-archiving frequency for each period (#11979) * Allow different reports pre-archiving frequency for each period * Add new config settings for archive frequency * added default config for range dates * print changed archive periods * minor change to log output * Clarify wording, processed != requested. * Fix integration test --- tests/PHPUnit/Integration/CronArchiveTest.php | 2 +- .../System/expected/test_ArchiveCronTest_archive_php_cron_output.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/PHPUnit') diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php index 682425f1e3..e8cfbc45fe 100644 --- a/tests/PHPUnit/Integration/CronArchiveTest.php +++ b/tests/PHPUnit/Integration/CronArchiveTest.php @@ -93,7 +93,7 @@ NOTES - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. See the doc at: http://piwik.org/docs/setup-auto-archiving/ - Reports for today will be processed at most every %s seconds. You can change this value in Piwik UI > Settings > General Settings. -- Reports for the current week/month/year will be refreshed at most every %s seconds. +- Reports for the current week/month/year will be requested at most every %s seconds. - Will process all 1 websites - Limiting segment archiving to following segments: * actions>=2;browserCode=FF diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt index 95b637e5ce..39ac07c52a 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -18,7 +18,7 @@ INFO [2017-01-22 00:03:37] NOTES INFO [2017-01-22 00:03:37] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. INFO [2017-01-22 00:03:37] See the doc at: http://piwik.org/docs/setup-auto-archiving/ INFO [2017-01-22 00:03:37] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. -INFO [2017-01-22 00:03:37] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. +INFO [2017-01-22 00:03:37] - Reports for the current week/month/year will be requested at most every 3600 seconds. INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 -- cgit v1.2.3