diff options
| -rw-r--r-- | config/global.ini.php | 4 | ||||
| -rw-r--r-- | core/CronArchive.php | 2 | ||||
| -rw-r--r-- | tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index c03ec5e90f..418d49731b 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -319,11 +319,11 @@ minimum_mysql_version = 4.1 ; PostgreSQL minimum required version minimum_pgsql_version = 8.3 -; Minimum advised memory limit in php.ini file (see memory_limit value) +; Minimum advised memory limit in Mb in php.ini file (see memory_limit value) ; Set to "-1" to always use the configured memory_limit value in php.ini file. minimum_memory_limit = 128 -; Minimum memory limit enforced when archived via ./console core:archive +; Minimum memory limit in Mb enforced when archived via ./console core:archive ; Set to "-1" to always use the configured memory_limit value in php.ini file. minimum_memory_limit_when_archiving = 768 diff --git a/core/CronArchive.php b/core/CronArchive.php index d9c536a8c3..4d82fab385 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -1154,7 +1154,7 @@ class CronArchive if (count($this->idSitesInvalidatedOldReports) > 0) { $ids = ", IDs: " . implode(", ", $this->idSitesInvalidatedOldReports); $this->logger->info("- Will process " . count($this->idSitesInvalidatedOldReports) - . " other websites because some old data reports have been invalidated (eg. using the Log Import script) " + . " other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) " . $ids); } 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 39ac07c52a..a20f089dce 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 @@ -26,7 +26,7 @@ INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-08-15 for INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 INFO [2017-01-22 00:03:37] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 -INFO [2017-01-22 00:03:37] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3 +INFO [2017-01-22 00:03:37] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script or the InvalidateReports plugin) , IDs: 1, 2, 3 INFO [2017-01-22 00:03:37] --------------------------- INFO [2017-01-22 00:03:37] START INFO [2017-01-22 00:03:37] Starting Piwik reports archiving... |