Permalink
Browse files

Merge branch 'master' of github.com:mozilla/tuxedo into bouncer-tests

Conflicts:
	bouncer/php/index.php
  • Loading branch information...
2 parents 03f65fb + 0650c81 commit 2d8b031b66e6d8c4723ad30a76eb3448e18ad5ee @brandonsavage brandonsavage committed Jan 10, 2013
Showing with 4 additions and 2 deletions.
  1. +1 −0 bouncer/php/index.php
  2. +3 −2 sentry/sentry.pl
@@ -5,6 +5,7 @@
* @subpackage pub
*/
require_once('./cfg/config.php'); // config file that defines constants
+
require_once('./functions.php'); // The functions
// if we don't have an os, make it windows, playing the odds
View
@@ -15,7 +15,7 @@
my $start_timestamp = time;
my %ua_options = ('keep_alive' => 5);
my $ua = LWP::UserAgent::Determined->new(%ua_options);
-$ua->timeout(5);
+$ua->timeout(10);
$ua->agent("Mozilla Mirror Monitor/1.0");
my $netres = Net::DNS::Resolver->new();
@@ -265,7 +265,8 @@ sub log_this {
$update_sth->execute($location->{id}, $mirror->{id}, '1', '1');
}
elsif (( $res->{_rc} == 404 ) || ( $res->{_rc} == 403 )) {
- $deactivate_sth->execute($location->{id}, $mirror->{id}, '0', '0');
+ log_this "FAILED. rc=" . $res->{_rc} . "\n";
+ $update_sth->execute($location->{id}, $mirror->{id}, '0', '0');
}
else {
log_this "FAILED. rc=" . $res->{_rc} . "\n";

0 comments on commit 2d8b031

Please sign in to comment.