moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added mtrace function for printing information to standard output

Browse source
This commit is contained in:
moodler 2004-08-05 17:08:46 +00:00
parent 69f78bcb59
commit defaac4cee
2 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
admin/cron.php
View file

@ -25,11 +25,6 @@
require_once("../config.php"); require_once("../config.php");
function trace($string, $eol="\n") {
fwrite(STDOUT, $string.$eol);
flush();
}
if (!$alreadyadmin = isadmin()) { if (!$alreadyadmin = isadmin()) {
unset($_SESSION['USER']); unset($_SESSION['USER']);
unset($USER); unset($USER);
@ -41,11 +36,11 @@
echo "<pre>\n"; echo "<pre>\n";
$timenow = time(); $timenow = time();
trace("Server Time: ".date('r',$timenow)."\n\n"); mtrace("Server Time: ".date('r',$timenow)."\n\n");
/// Run all cron jobs for each module /// Run all cron jobs for each module
trace("Starting activity modules"); mtrace("Starting activity modules");
if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron)")) { if ($mods = get_records_select("modules", "cron > 0 AND (($timenow - lastcron) > cron)")) {
foreach ($mods as $mod) { foreach ($mods as $mod) {
$libfile = "$CFG->dirroot/mod/$mod->name/lib.php"; $libfile = "$CFG->dirroot/mod/$mod->name/lib.php";
@ -53,18 +48,18 @@
include_once($libfile); include_once($libfile);
$cron_function = $mod->name."_cron"; $cron_function = $mod->name."_cron";
if (function_exists($cron_function)) { if (function_exists($cron_function)) {
trace("Processing module function $cron_function ...", ''); mtrace("Processing module function $cron_function ...", '');
if ($cron_function()) { if ($cron_function()) {
if (! set_field("modules", "lastcron", $timenow, "id", $mod->id)) { if (! set_field("modules", "lastcron", $timenow, "id", $mod->id)) {
trace("Error: could not update timestamp for $mod->fullname"); mtrace("Error: could not update timestamp for $mod->fullname");
} }
} }
trace("done."); mtrace("done.");
} }
} }
} }
} }
trace("Finished activity modules"); mtrace("Finished activity modules");
/// Run all core cron jobs, but not every time since they aren't too important. /// Run all core cron jobs, but not every time since they aren't too important.
/// These don't have a timer to reduce load, so we'll use a random number /// These don't have a timer to reduce load, so we'll use a random number
@ -74,7 +69,7 @@
$random100 = rand(0,100); $random100 = rand(0,100);
if ($random100 < 20) { // Approximately 20% of the time. if ($random100 < 20) { // Approximately 20% of the time.
trace("Running clean-up tasks..."); mtrace("Running clean-up tasks...");
/// Unenrol users who haven't logged in for $CFG->longtimenosee /// Unenrol users who haven't logged in for $CFG->longtimenosee
@ -83,7 +78,7 @@
if ($students = get_users_longtimenosee($longtime)) { if ($students = get_users_longtimenosee($longtime)) {
foreach ($students as $student) { foreach ($students as $student) {
if (unenrol_student($student->userid, $student->course)) { if (unenrol_student($student->userid, $student->course)) {
trace("Deleted student enrolment for user $student->userid from course $student->course"); mtrace("Deleted student enrolment for user $student->userid from course $student->course");
} }
} }
} }
@ -139,7 +134,7 @@
} // End of occasional clean-up tasks } // End of occasional clean-up tasks
if (file_exists("$CFG->dataroot/cronextra.php")) { if (file_exists("$CFG->dataroot/cronextra.php")) {
trace("Running extra commands in $CFG->dataroot/cronextra.php ..."); mtrace("Running extra commands in $CFG->dataroot/cronextra.php ...");
include("$CFG->dataroot/cronextra.php"); include("$CFG->dataroot/cronextra.php");
} }
@ -156,12 +151,12 @@
include_once("$CFG->dirroot/backup/backuplib.php"); include_once("$CFG->dirroot/backup/backuplib.php");
include_once("$CFG->dirroot/backup/lib.php"); include_once("$CFG->dirroot/backup/lib.php");
require_once ("$CFG->libdir/blocklib.php"); require_once ("$CFG->libdir/blocklib.php");
trace("Running backups if required..."); mtrace("Running backups if required...");
if (! schedule_backup_cron()) { if (! schedule_backup_cron()) {
trace("ERORR: Something went wrong while performing backup tasks!!!"); mtrace("ERORR: Something went wrong while performing backup tasks!!!");
} else { } else {
trace("Backup tasks finished."); mtrace("Backup tasks finished.");
} }
} }
} }
@ -169,12 +164,12 @@
if (!empty($CFG->enablerssfeeds)) { //Defined in admin/variables page if (!empty($CFG->enablerssfeeds)) { //Defined in admin/variables page
if (file_exists("$CFG->dirroot/rss/rsslib.php")) { if (file_exists("$CFG->dirroot/rss/rsslib.php")) {
include_once("$CFG->dirroot/rss/rsslib.php"); include_once("$CFG->dirroot/rss/rsslib.php");
trace("Running rssfeeds if required..."); mtrace("Running rssfeeds if required...");
if ( ! cron_rss_feeds()) { if ( ! cron_rss_feeds()) {
trace("Something went wrong while generating rssfeeds!!!"); mtrace("Something went wrong while generating rssfeeds!!!");
} else { } else {
trace("Rssfeeds finished"); mtrace("Rssfeeds finished");
} }
} }
} }
@ -184,16 +179,16 @@
$enrol = new enrolment_plugin(); $enrol = new enrolment_plugin();
$enrol->cron(); $enrol->cron();
if (!empty($enrol->log)) { if (!empty($enrol->log)) {
trace($enrol->log); mtrace($enrol->log);
} }
//Unset session variables and destroy it //Unset session variables and destroy it
@session_unset(); @session_unset();
@session_destroy(); @session_destroy();
trace("Cron script completed correctly"); mtrace("Cron script completed correctly");
$difftime = microtime_diff($starttime, microtime()); $difftime = microtime_diff($starttime, microtime());
trace("Execution took ".$difftime." seconds"); mtrace("Execution took ".$difftime." seconds");
?> ?>

7
lib/moodlelib.php
View file

@ -2866,5 +2866,12 @@ function address_in_subnet($addr, $subnetstr) {
return $found; return $found;
} }
function mtrace($string, $eol="\n") {
// For outputting debugging info
fwrite(STDOUT, $string.$eol);
flush();
}
// vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140: // vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
?> ?>