cvs: php-master-web /scripts mirror-test
| From: | jim winstead | Date: | Wed, 14 Aug 2002 19:41:37 +0000 |
| Subject: | cvs: php-master-web /scripts mirror-test | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-11969@lists.php.net to get a copy of this message | ||
jimw Wed Aug 14 15:41:37 2002 EDT
Modified files:
/php-master-web/scripts mirror-test
Log:
deal better with bogus results from mirror-info.php script
Index: php-master-web/scripts/mirror-test
diff -u php-master-web/scripts/mirror-test:1.10 php-master-web/scripts/mirror-test:1.11
--- php-master-web/scripts/mirror-test:1.10 Sun Jun 2 18:02:48 2002
+++ php-master-web/scripts/mirror-test Wed Aug 14 15:41:37 2002
@@ -12,7 +12,7 @@
$query = "SELECT maintainer,hostname,id FROM mirrors WHERE mirrortype = 1 AND active";
$result = mysql_query($query)
- or die("unable to get from the database");
+ or die("unable to get from the database: ".mysql_error());
for($i=0; $row = mysql_fetch_array($result,MYSQL_ASSOC); $i++) {
$hosts[$i]['hostname'] = $row['hostname'];
@@ -74,19 +74,10 @@
$fp = @fopen($file, "r");
$rv = @fread($fp, 1000);
- if(!$fp || strlen($rv) == "0") {
- $hosts[$i]['active'] = false;
- } else {
- $hosts[$i]['active'] = true;
- }
$info = explode("|", $rv);
- $hosts[$i]['phpversion'] = $info['1'];
- $hosts[$i]['lastupdate'] = $info['2'];
- $hosts[$i]['xtra'] = $info['3'];
-
- if (strlen($info['3']) > 0) {
- $moreinfo = true;
- }
+ $hosts[$i]['phpversion'] = $info[1];
+ $hosts[$i]['lastupdate'] = $info[2];
+ $hosts[$i]['xtra'] = $info[3];
}
/* reconnect to the database */
@@ -94,9 +85,9 @@
mysql_select_db("php3");
for($i=0; $i < $total; $i++) {
- if ($hosts[$i]['active']) {
+ if ($hosts[$i]['lastupdate']) {
$query = "UPDATE mirrors SET
lastchecked=NOW(),lastupdated=FROM_UNIXTIME(".$hosts[$i]['lastupdate']."),phpversion='".addslashes($hosts[$i]['phpversion'])."'
WHERE hostname = '" . $hosts[$i]['hostname'] . "'";
- $result = mysql_query($query) or die("unable to get from the database");
+ $result = mysql_query($query) or die("unable to update the database: $query:
".mysql_error());
}
}