diff options
| -rw-r--r-- | core/ArchiveProcessor.php | 2 | ||||
| -rw-r--r-- | core/CronArchive.php | 1 | ||||
| -rwxr-xr-x | misc/log-analytics/import_logs.py | 2 | ||||
| m--------- | plugins/CustomAlerts | 0 | ||||
| m--------- | tests/PHPUnit/UI | 0 |
5 files changed, 2 insertions, 3 deletions
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php index c93e913e0c..ca2ebde323 100644 --- a/core/ArchiveProcessor.php +++ b/core/ArchiveProcessor.php @@ -112,8 +112,6 @@ class ArchiveProcessor */ private $skipUniqueVisitorsCalculationForMultipleSites = true; - const SKIP_UNIQUE_VISITORS_FOR_MULTIPLE_SITES = 'enable_processing_unique_visitors_multiple_sites'; - public function __construct(Parameters $params, ArchiveWriter $archiveWriter) { $this->params = $params; diff --git a/core/CronArchive.php b/core/CronArchive.php index 743b88b888..4925d01c65 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -850,6 +850,7 @@ class CronArchive } else { $message .= "Response was '$response'"; } + $this->logError($message); return false; } diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index 3714420363..bf3515d49e 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -371,7 +371,7 @@ class Configuration(object): ) option_parser.add_option( '--url', dest='piwik_url', - help="REQUIRED Piwik base URL, eg. http://example.com/piwik/ or http://analytics.example.net", + help="REQUIRED Your Piwik server URL, eg. http://example.com/piwik/ or http://analytics.example.net", ) option_parser.add_option( '--dry-run', dest='dry_run', diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject f23988fd34e52238546671b57d5df6456ddde4b +Subproject 820dcaa24f8a571bf37d4375d411e2a893875f4 diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject b2f0c2bc37385d0c54cc7efc102cd9ccd1f2d46 +Subproject 99c48cafdabf209114d6dcd25c82189638f9886 |