diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-05-04 10:13:16 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-05-04 10:13:16 +0400 |
commit | 6279a4cf22fe33e32e7338d0e53398df786a16f4 (patch) | |
tree | b5ca897ed7e1a702c90a28c0b3d8379f911f6398 | |
parent | a5da45c2f74e53999feb3e1458ea16bf1981e9f8 (diff) |
2.1.1-b3
-rw-r--r-- | core/Version.php | 2 | ||||
-rwxr-xr-x | misc/log-analytics/import_logs.py | 8 | ||||
-rw-r--r-- | plugins/CoreConsole/Commands/CoreArchiver.php | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/core/Version.php b/core/Version.php index 6f4c82f5ba..97f1d59179 100644 --- a/core/Version.php +++ b/core/Version.php @@ -21,5 +21,5 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.2.1-b2'; + const VERSION = '2.2.1-b3'; } diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index ec6a5e22a4..cfa8d54944 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -1358,11 +1358,9 @@ class Recorder(object): dates=','.join(dates), idSites=','.join(str(site_id) for site_id in stats.piwik_sites), ) - print('To re-process these reports with your new update data, execute the ' - '`piwik/console core:archive` script, or see: http://piwik.org/setup-auto-archiving/ ' - 'for more info.') - - + print('To re-process these reports with your new update data, execute the following command: \n ' + '`piwik/console core:archive --url=http://example/piwik/`\n' + 'Reference: http://piwik.org/docs/setup-auto-archiving/ ') class Hit(object): diff --git a/plugins/CoreConsole/Commands/CoreArchiver.php b/plugins/CoreConsole/Commands/CoreArchiver.php index 0fe60d3bc9..32ae26e02b 100644 --- a/plugins/CoreConsole/Commands/CoreArchiver.php +++ b/plugins/CoreConsole/Commands/CoreArchiver.php @@ -35,14 +35,14 @@ class CoreArchiver extends ConsoleCommand { $command->setName('core:archive'); $command->setDescription("Runs the CLI archiver. It is an important tool for general maintenance and to keep Piwik very fast."); - $command->setHelp("* It is recommended to run the script with the option --piwik-domain=[piwik-server-url] only. Other options are not required. + $command->setHelp("* It is recommended to run the script with the option --url=[piwik-server-url] only. Other options are not required. * This script should be executed every hour via crontab, or as a daemon. * You can also run it via http:// by specifying the Super User &token_auth=XYZ as a parameter ('Web Cron'), but it is recommended to run it via command line/CLI instead. * If you have any suggestion about this script, please let the team know at hello@piwik.org * Enjoy!"); $command->addOption('url', null, InputOption::VALUE_REQUIRED, "Mandatory option as an alternative to '--piwik-domain'. Must be set to the Piwik base URL.\nFor example: --url=http://analytics.example.org/ or --url=https://example.org/piwik/"); - $command->addOption('force-all-websites', null, InputOption::VALUE_NONE, "If specified, the script will trigger archiving on all websites and all past dates.\nYou may use --force-all-periods=[seconds] to trigger archiving on those websites\nthat had visits in the last [seconds] seconds."); + $command->addOption('force-all-websites', null, InputOption::VALUE_NONE, "If specified, the script will trigger archiving on all websites.\nUse with --force-all-periods=[seconds] to also process those websites\nthat had visits in the last [seconds] seconds."); $command->addOption('force-all-periods', null, InputOption::VALUE_OPTIONAL, "Limits archiving to websites with some traffic in the last [seconds] seconds. \nFor example --force-all-periods=86400 will archive websites that had visits in the last 24 hours. \nIf [seconds] is not specified, all websites with visits in the last " . CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE . "\n seconds (" . round(CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE / 86400) . " days) will be archived."); $command->addOption('force-timeout-for-periods', null, InputOption::VALUE_OPTIONAL, "The current week/ current month/ current year will be processed at most every [seconds].\nIf not specified, defaults to " . CronArchive::SECONDS_DELAY_BETWEEN_PERIOD_ARCHIVES . "."); $command->addOption('force-date-last-n', null, InputOption::VALUE_REQUIRED, "This script calls the API with period=lastN. You can force the N in lastN by specifying this value."); |