summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2011-09-25 18:05:15 +0000
committerMagnus Hagander2011-09-25 18:05:15 +0000
commit1f1036264b02f7af2868ec15c0899911c82d29ca (patch)
treed160b8ffd5a2b0f3f7a136c0677de10099368332
parent2c10eee18163cb24397f9c3797250adc187500f5 (diff)
Use "master" instead of "wwwmaster" since we support more than one type of mirror
git-svn-id: file:///Users/dpage/pgweb/svn-repo/trunk@2895 8f5c7a92-453e-0410-a47f-ad33c8a6b003
-rw-r--r--portal/tools/automirror/automirror.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/portal/tools/automirror/automirror.php b/portal/tools/automirror/automirror.php
index 8d2fe1b5..ff7d2e5c 100644
--- a/portal/tools/automirror/automirror.php
+++ b/portal/tools/automirror/automirror.php
@@ -49,8 +49,8 @@ function check_mirror($log, $db, $mirrtype, $MASTERIP, $MASTERHOST, $MIRRORHOST,
$diff = $wwwmaster->_lastupdate - $current->_lastupdate;
if ($diff < 0) {
- $log->Log('Mirror ' . $row[1] . ' (' . $row[3] . ') claims to be newer than wwwmaster!');
- $log->Log('Mirror has ' . $current->LastUpdatedStr() . ', wwwmaster has ' . $wwwmaster->LastUpdatedStr());
+ $log->Log('Mirror ' . $row[1] . ' (' . $row[3] . ') claims to be newer than master!');
+ $log->Log('Mirror has ' . $current->LastUpdatedStr() . ', master has ' . $wwwmaster->LastUpdatedStr());
if ($row[2] == 1) {
$db->DisableMirror($row[0],'Newer than master');
$log->Log('Mirror ' . $row[1] . ' now disabled');
@@ -59,7 +59,7 @@ function check_mirror($log, $db, $mirrtype, $MASTERIP, $MASTERHOST, $MIRRORHOST,
}
if ($diff > $MAX_TIME_DIFF) {
$log->Log('Mirror ' . $row[1] . ' (' . $row[3] . ') has not been updated.');
- $log->Log('Mirror has ' . $current->LastUpdatedStr() . ', wwwmaster has ' . $wwwmaster->LastUpdatedStr());
+ $log->Log('Mirror has ' . $current->LastUpdatedStr() . ', master has ' . $wwwmaster->LastUpdatedStr());
if ($row[2] == 1) {
$db->DisableMirror($row[0],'Not updated');
$log->Log('Mirror ' . $row[1] . ' now disabled');