mirrored from git://git.moodle.org/moodle.git
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MDL-60514 tasks: added new config parameter. changes in cron execution
- Loading branch information
Toni Barberà Melià
committed
Oct 25, 2018
1 parent
c2f1dbc
commit c759ae5
Showing
9 changed files
with
112 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
<?php | ||
// This file is part of Moodle - http://moodle.org/ | ||
// | ||
// Moodle is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// Moodle is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
/** | ||
* Form for scheduled tasks admin pages. | ||
* | ||
* @package tool_task | ||
* @copyright 2018 Toni Barbera <toni@moodle.com> | ||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
*/ | ||
|
||
namespace tool_task; | ||
|
||
defined('MOODLE_INTERNAL') || die(); | ||
|
||
/** | ||
* Running tasks from CLI. | ||
* | ||
* @copyright 2018 Toni Barbera <toni@moodle.com> | ||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
*/ | ||
class run_from_cli { | ||
|
||
/** | ||
* Find the path of PHP CLI binary. | ||
* | ||
* @return string|false The PHP CLI executable PATH | ||
*/ | ||
protected static function find_php_cli_path() { | ||
global $CFG; | ||
|
||
if (!empty($CFG->pathtophp) && is_executable(trim($CFG->pathtophp))) { | ||
return $CFG->pathtophp; | ||
} | ||
|
||
return false; | ||
} | ||
|
||
/** | ||
* Returns if Moodle have access to PHP CLI binary or not. | ||
* | ||
* @return bool | ||
*/ | ||
public static function is_runnable():bool { | ||
return self::find_php_cli_path() !== false; | ||
} | ||
|
||
/** | ||
* Executes a cron from web invocation using PHP CLI. | ||
* | ||
* @param \core\task\task_base $task Task that be executed via CLI. | ||
* @return bool | ||
* @throws \moodle_exception | ||
*/ | ||
public static function execute(\core\task\task_base $task):bool { | ||
global $CFG; | ||
|
||
if (!self::is_runnable()) { | ||
$redirecturl = new \moodle_url('/admin/settings.php', ['section' => 'systempaths']); | ||
throw new \moodle_exception('cannotfindthepathtothecli', 'tool_task', $redirecturl->out()); | ||
} else { | ||
// Shell-escaped path to the PHP binary. | ||
$phpbinary = escapeshellarg(self::find_php_cli_path()); | ||
|
||
// Shell-escaped path CLI script. | ||
$pathcomponents = [$CFG->dirroot, $CFG->admin, 'tool', 'task', 'cli', 'schedule_task.php']; | ||
$scriptpath = escapeshellarg(implode(DIRECTORY_SEPARATOR, $pathcomponents)); | ||
|
||
// Shell-escaped task name. | ||
$classname = get_class($task); | ||
$taskarg = escapeshellarg("--execute={$classname}"); | ||
|
||
// Build the CLI command. | ||
$command = "{$phpbinary} {$scriptpath} {$taskarg}"; | ||
|
||
// Execute it. | ||
passthru($command); | ||
} | ||
|
||
return true; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters