Merge pull request #8418 from piwik/8316_core_archive_url

Fixes #8316, re-add core:archive URL override functionality for usersthat do not use systems that support CLI archiving.

1 files changed, 8 insertions, 3 deletions

diff --git a/plugins/CoreConsole/Commands/CoreArchiver.php b/plugins/CoreConsole/Commands/CoreArchiver.php
index cfe7905d3d..40fc7d4c71 100644
--- a/plugins/CoreConsole/Commands/CoreArchiver.php
+++ b/plugins/CoreConsole/Commands/CoreArchiver.php
@@ -23,12 +23,12 @@ class CoreArchiver extends ConsoleCommand
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $archiver = self::makeArchiver("", $input);
+        $archiver = self::makeArchiver($input->getOption('url'), $input);
         $archiver->main();
     }
 
     // also used by another console command
-    public static function makeArchiver($url, InputInterface $input) // TODO: remove url from this function
+    public static function makeArchiver($url, InputInterface $input)
     {
         $archiver = new CronArchive();
 
@@ -56,6 +56,8 @@ class CoreArchiver extends ConsoleCommand
         $segmentIds = array_map('trim', $segmentIds);
         $archiver->setSegmentsToForceFromSegmentIds($segmentIds);
 
+        $archiver->setUrlToPiwik($url);
+
         return $archiver;
     }
 
@@ -75,7 +77,10 @@ class CoreArchiver extends ConsoleCommand
   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 feedback@piwik.org
 * Enjoy!");
-        $command->addOption('url', null, InputOption::VALUE_REQUIRED, "Deprecated.");
+        $command->addOption('url', null, InputOption::VALUE_REQUIRED,
+            "Forces the value of this option to be used as the URL to Piwik. \nIf your system does not support"
+            . " archiving with CLI processes, you may need to set this in order for the archiving HTTP requests to use"
+            . " the desired URLs.");
         $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 that had visits in the last [seconds] seconds.\nLaunching several processes"