nm4 2007/01/09 13:41:25 GMT
Modified files:
exim-mirmon/mirmon countries.list mirmon
Added files:
exim-mirmon crontab
exim-mirmon/bin run_mirmon
exim-mirmon/mirmon .cvsignore
Removed files:
exim-mirmon/bin mirmon_ftp mirmon_www
exim-mirmon/mirmon exim_ftp_state exim_www_state
exim-mirmon/mirmon/backup exim_mirrors_ftp_05082005.lst
exim_mirrors_ftp_29052005.lst
exim_mirrors_www_05082005.lst
exim_mirrors_www_29052005.lst
Log:
Updated to current mirmon version. Relocated to /home/services area
Revision Changes Path
1.2 +0 -3 exim/exim-mirmon/bin/mirmon_ftp (dead)
1.2 +0 -3 exim/exim-mirmon/bin/mirmon_www (dead)
1.1 +12 -0 exim/exim-mirmon/bin/run_mirmon (new)
1.1 +6 -0 exim/exim-mirmon/crontab (new)
1.1 +3 -0 exim/exim-mirmon/mirmon/.cvsignore (new)
1.2 +0 -38 exim/exim-mirmon/mirmon/backup/exim_mirrors_ftp_05082005.lst (dead)
1.2 +0 -47 exim/exim-mirmon/mirmon/backup/exim_mirrors_ftp_29052005.lst (dead)
1.2 +0 -26 exim/exim-mirmon/mirmon/backup/exim_mirrors_www_05082005.lst (dead)
1.2 +0 -26 exim/exim-mirmon/mirmon/backup/exim_mirrors_www_29052005.lst (dead)
1.2 +6 -1 exim/exim-mirmon/mirmon/countries.list
1.2 +0 -50 exim/exim-mirmon/mirmon/exim_ftp_state (dead)
1.2 +0 -42 exim/exim-mirmon/mirmon/exim_www_state (dead)
1.2 +246 -236 exim/exim-mirmon/mirmon/mirmon
Index: crontab
====================================================================
# $Cambridge: exim/exim-mirmon/crontab,v 1.1 2007/01/09 13:41:25 nm4 Exp $
#
# Schedule mirmon runs hourly
39 * * * * /home/services/mirmon/bin/run_mirmon
#
# end
Index: run_mirmon
====================================================================
#!/bin/sh
# $Cambridge: exim/exim-mirmon/bin/run_mirmon,v 1.1 2007/01/09 13:41:25 nm4 Exp $
#
# Runs mirmon for both ftp and www repos
#
MIRMON_BASE=/home/services/mirmon/mirmon
cd ${MIRMON_BASE} || exit
for set in www ftp
do
./mirmon -q -get update -c mirmon_${set}.conf
done
Index: .cvsignore
====================================================================
# $Cambridge: exim/exim-mirmon/mirmon/.cvsignore,v 1.1 2007/01/09 13:41:25 nm4 Exp $
exim_ftp_state
exim_www_state
Index: countries.list
===================================================================
RCS file: /home/cvs/exim/exim-mirmon/mirmon/countries.list,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- countries.list 9 Jan 2007 12:46:31 -0000 1.1
+++ countries.list 9 Jan 2007 13:41:25 -0000 1.2
@@ -1,3 +1,4 @@
+# $Cambridge: exim/exim-mirmon/mirmon/countries.list,v 1.2 2007/01/09 13:41:25 nm4 Exp $
ad - andorra
ae - united arab emirates
af - afghanistan
@@ -46,7 +47,6 @@
cn - china
co - colombia
cr - costa rica
-cs - serbia and montenegro
cu - cuba
cv - cape verde
cx - christmas island
@@ -76,6 +76,7 @@
gd - grenada
ge - georgia
gf - french guiana
+gg - guernsey
gh - ghana
gi - gibraltar
gl - greenland
@@ -98,12 +99,14 @@
id - indonesia
ie - ireland
il - israel
+im - isle of man
in - india
io - british indian ocean territory
iq - iraq
ir - iran, islamic republic of
is - iceland
it - italy
+je - jersey
jm - jamaica
jo - jordan
jp - japan
@@ -132,6 +135,7 @@
ma - morocco
mc - monaco
md - moldova, republic of
+me - montenegro
mg - madagascar
mh - marshall islands
mk - macedonia, the former yugoslav republic of
@@ -180,6 +184,7 @@
qa - qatar
re - reunion
ro - romania
+rs - serbia
ru - russian federation
rw - rwanda
sa - saudi arabia
Index: mirmon
===================================================================
RCS file: /home/cvs/exim/exim-mirmon/mirmon/mirmon,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mirmon 9 Jan 2007 12:46:31 -0000 1.1
+++ mirmon 9 Jan 2007 13:41:25 -0000 1.2
@@ -1,19 +1,20 @@
#! /usr/bin/perl -w
-
+# $Cambridge: exim/exim-mirmon/mirmon/mirmon,v 1.2 2007/01/09 13:41:25 nm4 Exp $
+#
# Copyright (c) 2003 Henk Penning, all rights reserved.
# penning@???, http://www.cs.uu.nl/staff/henkp.html
# Version 1.1 was donated to the Apache Software Foundation 2003 Jan 28
-# $Id: mirmon,v 1.36 2004/12/28 17:54:10 henkp Exp $
+# $Id: mirmon,v 1.37 2006/12/04 15:16:11 henkp Exp henkp $
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
-#
+#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
-#
+#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -21,9 +22,11 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
+#
+# Thanks to Klaus Heinz <heinz@???> for sugestions ao htm_head
my $PRG = 'mirmon' ;
-my $VER = '$Id: mirmon,v 1.36 2004/12/28 17:54:10 henkp Exp $' ;
+my $VER = '$Id: mirmon,v 1.37 2006/12/04 15:16:11 henkp Exp henkp $' ;
use strict ;
use IO::Pipe ;
@@ -50,7 +53,7 @@
) ;
my @OPT_KEYS =
qw( project_logo min_poll min_sync max_sync list_style htm_top htm_foot
- put_histo
+ htm_head put_histo
) ;
my %CNF_KEYS ; for ( @REQ_KEYS, @OPT_KEYS, keys %CNF )
{ $CNF_KEYS { $_ } ++ ; }
@@ -131,7 +134,7 @@
}
for my $key ( sort keys %HREF )
{ printf "show_conf : for site '%s' use instead\n '%s'\n",
- $key, $HREF { $key } if $opt{v} ;
+ $key, $HREF { $key } if $opt{v} ;
}
printf "show_conf : included '%s'\n", join "', '", @{ $CNF{_include} } ;
print "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" ;
@@ -163,34 +166,34 @@
{ my ($key,$val) = split ' ', $_, 2 ;
$val = '' unless defined $val ;
print "conf '$FILE' : key '$key', val '$val'\n" if $opt{d} ;
- if ( exists $CNF_KEYS { $key } )
- { $CNF { $key } = $val ; }
- elsif ( $key eq 'site_url' )
- { my ( $site, $url ) = split ' ' , $val ;
- $url .= '/' unless $url =~ m!/$! ;
- $HREF { lc $site } = $url ;
- printf "config : for site '%s' use instead\n '%s'\n",
- $site, $url if $opt{v} ;
- }
- elsif ( $key eq 'env' )
- { my ( $x, $y ) = split ' ' , $val ;
- $ENV { $x } = $y ;
- printf "config : setenv '%s'\n '%s'\n", $x, $y if $opt{v} ;
- }
- elsif ( $key eq 'no_randomize' )
- { $CNF { randomize } = 0 ; }
- elsif ( $key eq 'include' )
- { get_conf $val ; }
- elsif ( $key eq 'show' )
- { show_conf unless $opt{q} ; }
- elsif ( $key eq 'exit' )
- { Error 'exit per config directive' ; }
- elsif ( $key eq 'max_age' )
- { $CNF { max_sync } = $val ; }
- else
- { show_conf ;
- Error "unknown keyword '$key' (value '$val')" ;
- }
+ if ( exists $CNF_KEYS { $key } )
+ { $CNF { $key } = $val ; }
+ elsif ( $key eq 'site_url' )
+ { my ( $site, $url ) = split ' ' , $val ;
+ $url .= '/' unless $url =~ m!/$! ;
+ $HREF { lc $site } = $url ;
+ printf "config : for site '%s' use instead\n '%s'\n",
+ $site, $url if $opt{v} ;
+ }
+ elsif ( $key eq 'env' )
+ { my ( $x, $y ) = split ' ' , $val ;
+ $ENV { $x } = $y ;
+ printf "config : setenv '%s'\n '%s'\n", $x, $y if $opt{v} ;
+ }
+ elsif ( $key eq 'no_randomize' )
+ { $CNF { randomize } = 0 ; }
+ elsif ( $key eq 'include' )
+ { get_conf $val ; }
+ elsif ( $key eq 'show' )
+ { show_conf unless $opt{q} ; }
+ elsif ( $key eq 'exit' )
+ { Error 'exit per config directive' ; }
+ elsif ( $key eq 'max_age' )
+ { $CNF { max_sync } = $val ; }
+ else
+ { show_conf ;
+ Error "unknown keyword '$key' (value '$val')" ;
+ }
}
}
@@ -283,13 +286,13 @@
if ( exists $OLD { $url } )
{ $time = $OLD { $url } [ 0 ] ;
$vrfy = $OLD { $url } [ 2 ] ;
- $hstp = substr $OLD { $url } [ 3 ], 1 - $HIST ;
+ $hstp = substr $OLD { $url } [ 3 ], 1 - $HIST ;
$hsts = $OLD { $url } [ 4 ] ;
}
else
{ $time = 'undef' ;
$vrfy = 'undef' ;
- $hstp = '' ;
+ $hstp = '' ;
$hsts = '' ;
}
$RES { $url } = [ $time, $stat, $vrfy, $hstp . 'f', $hsts, $^T ] ;
@@ -315,12 +318,12 @@
while ( <STT> )
{ chop ;
my ( $url, $time, $stat, $vrfy, $hstp, $hsts, $lprb ) = split ' ' ;
- $stat =~ s/_/ /g ;
- $hstp = '' unless defined $hstp ;
- $hsts = '' unless defined $hsts ;
- $hsts = '' if $hsts eq 'undef' ;
- $lprb = 'undef' unless defined $lprb ;
- $OLD { $url } = [ $time, $stat, $vrfy, $hstp, $hsts, $lprb ] ;
+ $stat =~ s/_/ /g ;
+ $hstp = '' unless defined $hstp ;
+ $hsts = '' unless defined $hsts ;
+ $hsts = '' if $hsts eq 'undef' ;
+ $lprb = 'undef' unless defined $lprb ;
+ $OLD { $url } = [ $time, $stat, $vrfy, $hstp, $hsts, $lprb ] ;
}
close STT ;
}
@@ -340,10 +343,10 @@
if ( aprx_le $stmp, $^T - tim_to_s '1d' )
{ $res = sprintf "%s-%s%s"
- , $^T
- , substr ( $hist, 1 - $HIST )
- , age_code ( $time )
- ;
+ , $^T
+ , substr ( $hist, 1 - $HIST )
+ , age_code ( $time )
+ ;
}
return $res ;
}
@@ -358,7 +361,7 @@
my @OUT = @{ $RES { $url } } ;
$OUT [ 1 ] =~ s/\s/_/g ;
printf TMP "%s %s\n", $url, join ' ', @OUT
- or Error "can't print to $TMP ($!)" ;
+ or Error "can't print to $TMP ($!)" ;
}
close TMP ;
if ( -z $TMP )
@@ -374,7 +377,7 @@
{ chop ;
next if /^#/ ;
my ( $code, $dash, $reg ) = split ' ', $_, 3 ;
- $CCS { lc $code } = lc $reg ;
+ $CCS { lc $code } = lc $reg ;
}
close CCS ;
}
@@ -398,32 +401,32 @@
while ( <LST> )
{ chop ;
next if /^#/ ;
- next if /^\s*$/ ;
+ next if /^\s*$/ ;
if ( $CNF { list_style } eq 'plain' )
- { ( $reg, $url ) = split ' ' ;
- unless ( $url =~ m!/$! )
- { print "*** mirmon appended '/' to $url\n" unless $opt{q} ;
- $url .= '/' ;
- }
- }
- elsif ( $CNF { list_style } eq 'apache' )
- { my $apache_type ;
- ( $apache_type, $reg, $url ) = split ' ' ;
- unless ( defined $APA_TYPES { $apache_type } )
- { print "*** strange type : $apache_type\n" unless $opt{q} ;
- next ;
- }
- unless ( $url =~ m!/$! )
- { print "*** missing '/' in $url\n" unless $opt{q} ;
- $url .= '/' ;
- }
- }
+ { ( $reg, $url ) = split ' ' ;
+ unless ( $url =~ m!/$! )
+ { print "*** mirmon appended '/' to $url\n" unless $opt{q} ;
+ $url .= '/' ;
+ }
+ }
+ elsif ( $CNF { list_style } eq 'apache' )
+ { my $apache_type ;
+ ( $apache_type, $reg, $url ) = split ' ' ;
+ unless ( defined $APA_TYPES { $apache_type } )
+ { print "*** strange type : $apache_type\n" unless $opt{q} ;
+ next ;
+ }
+ unless ( $url =~ m!/$! )
+ { print "*** missing '/' in $url\n" unless $opt{q} ;
+ $url .= '/' ;
+ }
+ }
- my $site = site $url ;
- my $type = type $url ;
+ my $site = site $url ;
+ my $type = type $url ;
- unless ( defined $site )
- { print "*** strange url : '$url'\n" unless $opt{q} ; next ; }
+ unless ( defined $site )
+ { print "*** strange url : '$url'\n" unless $opt{q} ; next ; }
$LST { $url } = [ $type , $site, $reg ] ;
}
@@ -487,14 +490,14 @@
while ( $hst ne '' )
{ if ( substr ( $prf, 0, 1 ) eq substr ( $hst, 0, 1 ) )
{ $cnt ++ ;
- $hst = substr $hst, 1 ;
- }
+ $hst = substr $hst, 1 ;
+ }
else
- { $res .= img_sf_cnt $prf, $cnt ;
- $prf = substr $hst, 0, 1 ;
- $hst = substr $hst, 1 ;
- $cnt = 1 ;
- }
+ { $res .= img_sf_cnt $prf, $cnt ;
+ $prf = substr $hst, 0, 1 ;
+ $hst = substr $hst, 1 ;
+ $cnt = 1 ;
+ }
}
$res .= img_sf_cnt $prf, $cnt if $cnt ;
return $res ;
@@ -522,12 +525,12 @@
for my $url ( keys %RES )
{ ( $time, $stat, $vrfy, $hstp, $hsts, $lprb ) = @{ $RES { $url } } ;
my $hr = int ( ( $^T - $lprb ) / 3600 + 0.5 ) ;
- $hr_min = $hr if ! defined $hr_min or $hr < $hr_min ;
- $hr_max = $hr if ! defined $hr_max or $hr > $hr_max ;
+ $hr_min = $hr if ! defined $hr_min or $hr < $hr_min ;
+ $hr_max = $hr if ! defined $hr_max or $hr > $hr_max ;
if ( $stat eq 'ok' )
- { $tab { $hr } ++ ; $s_cnt ++ ; }
- else
- { $bad { $hr } ++ ; $f_cnt ++ ; }
+ { $tab { $hr } ++ ; $s_cnt ++ ; }
+ else
+ { $bad { $hr } ++ ; $f_cnt ++ ; }
}
$res = TR
( TH ( 'hours ago' )
@@ -536,7 +539,7 @@
. TH sprintf
( '%s %s, %s %s'
, $s_cnt , GRN ( 'successful' )
- , $f_cnt , RED ( 'failed' )
+ , $f_cnt , RED ( 'failed' )
)
) ;
@@ -553,16 +556,16 @@
my $y = $bad { $hr } || 0 ;
my $n = int ( $x / $max * $HIST ) ;
my $b = int ( $y / $max * $HIST ) ;
- $res .= TR
- ( TDr ( $hr )
- . TDr ( $x )
- . TDr ( $y )
- . TD
- ( ( $n ? img_sf_cnt ( 's', $n ) : '' )
- . ( $b ? img_sf_cnt ( 'f', $b ) : '' )
- . ( ( $n + $b ) ? '' : ' ' )
- )
- ) ;
+ $res .= TR
+ ( TDr ( $hr )
+ . TDr ( $x )
+ . TDr ( $y )
+ . TD
+ ( ( $n ? img_sf_cnt ( 's', $n ) : '' )
+ . ( $b ? img_sf_cnt ( 'f', $b ) : '' )
+ . ( ( $n + $b ) ? '' : ' ' )
+ )
+ ) ;
}
return "<BLOCKQUOTE>\n" . TAB ( $res ) . "</BLOCKQUOTE>\n" ;
}
@@ -587,14 +590,14 @@
for my $url ( keys %RES )
{ my $time = $RES { $url } [ 0 ] ;
if ( $time =~ /^\d+$/ )
- { my $s = $^T - $time ;
- my $hr = int ( $s / $MAX_H * ( $MAX_h - 1 ) + 0.5 ) ;
- if ( $s <= $MAX_H ) { $tab { $hr } ++ ; }
- elsif ( $s <= $MAX_O ) { $tab { old } ++ ; }
- else { $tab { ded } ++ ; }
- }
- else
- { $tab { bad } ++ ; }
+ { my $s = $^T - $time ;
+ my $hr = int ( $s / $MAX_H * ( $MAX_h - 1 ) + 0.5 ) ;
+ if ( $s <= $MAX_H ) { $tab { $hr } ++ ; }
+ elsif ( $s <= $MAX_O ) { $tab { old } ++ ; }
+ else { $tab { ded } ++ ; }
+ }
+ else
+ { $tab { bad } ++ ; }
}
my $max = 0 ;
for ( grep ! exists $Wmx { $_ }, keys %tab )
@@ -609,13 +612,13 @@
my $d = int ( $bad { $aux } / $W { $aux } ) ;
for ( my $i = 1 ; $i < $W { $aux } ; $i++ )
{ $tab { $aux . $i } = $d ;
- if ( $bad { $aux } % $Wmx { $aux } > $i )
- { $tab { $aux . $i } ++ ;
- $tab { $aux } -- ;
- }
- }
+ if ( $bad { $aux } % $Wmx { $aux } > $i )
+ { $tab { $aux . $i } ++ ;
+ $tab { $aux } -- ;
+ }
+ }
$tab { $aux } -= ( $W { $aux } - 1 ) * $d ;
- $max = $tab { $aux } if $max < $tab { $aux } ;
+ $max = $tab { $aux } if $max < $tab { $aux } ;
}
}
@@ -638,29 +641,29 @@
;
for ( my $h = $H ; $h > 0 ; $h -- )
{ $res .= "<TR>\n" ;
- $res .= sprintf "<TH ROWSPAN=3 VALIGN=\"TOP\">↑</TH>\n"
- if $h == $H ;
- $res .= sprintf '<TD ROWSPAN=%d ALIGN="CENTER">%s</TD>' . "\n"
- , $H-6, NSS ( $max ) if $h == $H - 3 ;
- $res .= sprintf "<TH ROWSPAN=3 VALIGN=\"BOTTOM\">↓</TH>\n"
- if $h == 3 ;
+ $res .= sprintf "<TH ROWSPAN=3 VALIGN=\"TOP\">↑</TH>\n"
+ if $h == $H ;
+ $res .= sprintf '<TD ROWSPAN=%d ALIGN="CENTER">%s</TD>' . "\n"
+ , $H-6, NSS ( $max ) if $h == $H - 3 ;
+ $res .= sprintf "<TH ROWSPAN=3 VALIGN=\"BOTTOM\">↓</TH>\n"
+ if $h == 3 ;
for my $x ( @keys )
- { $res .= sprintf "<TH>%s</TH>\n"
- , ( ( $hst { $x } >= $h )
- ? img_sf
- ( $x =~ /^\d+$/
- ? 's'
- : ( $x =~ /^old/ ? 'b' : ( $x =~ /^ded/ ? 'f' : 'z' ) )
- )
- : ( ( $h == 1 and $hst { $x } == 0 )
- ? sprintf
- ( '<IMG SRC="%s/bar.gif" ALT="" BORDER=0>'
- , $CNF { icons }
- )
- : ''
- )
- ) ;
- }
+ { $res .= sprintf "<TH>%s</TH>\n"
+ , ( ( $hst { $x } >= $h )
+ ? img_sf
+ ( $x =~ /^\d+$/
+ ? 's'
+ : ( $x =~ /^old/ ? 'b' : ( $x =~ /^ded/ ? 'f' : 'z' ) )
+ )
+ : ( ( $h == 1 and $hst { $x } == 0 )
+ ? sprintf
+ ( '<IMG SRC="%s/bar.gif" ALT="" BORDER=0>'
+ , $CNF { icons }
+ )
+ : ''
+ )
+ ) ;
+ }
$res .= "</TR>\n" ;
}
@@ -707,7 +710,7 @@
$res .= "</TR>\n" ;
my $FRMT = '<TD ALIGN="CENTER" COLSPAN=%d> %s </TD>' ;
-
+
$res .= "<TR>\n" ;
$res .= sprintf "$FRMT\n", 1, NSS scalar keys %RES ;
$res .= "<TH>|</TH>\n" ;
@@ -729,7 +732,7 @@
{ $res .= sprintf
"<BR>each %s %s %s %s unit represents %s mirror sites.\n"
, img_sf ( 's' ) , img_sf ( 'f' ), img_sf ( 'b' ) , img_sf ( 'z' )
- , sprintf ( "%.1f", $max / $H )
+ , sprintf ( "%.1f", $max / $H )
}
return $res ;
}
@@ -770,11 +773,11 @@
{ my ( $time, $stat, $vrfy ) = @{ $RES { $url } } ;
if ( $stat eq 'ok' ) { $ok ++ ; } else { $stats { $stat } ++ ; }
if ( $time eq 'undef' )
- { $bad ++ ; }
- elsif ( 'f' eq age_code $time )
- { $old ++ ; }
- if ( $vrfy eq 'undef' or aprx_lt $vrfy, $^T - max_vrfy )
- { $unr ++ ; }
+ { $bad ++ ; }
+ elsif ( 'f' eq age_code $time )
+ { $old ++ ; }
+ if ( $vrfy eq 'undef' or aprx_lt $vrfy, $^T - max_vrfy )
+ { $unr ++ ; }
}
my $STAT = sprintf
@@ -795,31 +798,31 @@
for my $reg ( sort keys %tab )
{ $refs .= sprintf " %s \n"
, url "#$reg"
- , "<FONT SIZE=\"+1\">$reg</FONT>"
- ;
+ , "<FONT SIZE=\"+1\">$reg</FONT>"
+ ;
}
my $COLS = 5 ;
my $LOGO = $CNF { project_logo }
? url
( $CNF { project_url }
- , sprintf
+ , sprintf
( '<IMG SRC="%s" ALT="%s" ALIGN="RIGHT" BORDER=0>'
- , $CNF { project_logo }
- , $CNF { project_name }
- )
+ , $CNF { project_logo }
+ , $CNF { project_name }
+ )
)
: ''
;
my $HTOP = $CNF{htm_top} ? $CNF{htm_top} . "\n" : '' ;
my $FOOT = $CNF{htm_foot} ? $CNF{htm_foot} . "\n" : '' ;
+ my $HEAD = $CNF{htm_head} ? $CNF{htm_head} . "\n" : '' ;
my $TITL = url $CNF{project_url}, $CNF{project_name} ;
my $EXPD = exp_date ;
open PPP, ">$TMP" or Error "can't write $TMP ($!)" ;
print PPP '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01'
. ' Transitional//EN"'
-# . ' "http://www.w3.org/TR/html4/loose.dtd"'
. '>' ;
print PPP "<HTML>\n" ;
print PPP "<HEAD>\n" ;
@@ -828,6 +831,7 @@
. 'CONTENT="text/html; charset=ISO-8859-1">' ;
print PPP "<META HTTP-EQUIV=\"refresh\" CONTENT=\"3600\">\n" ;
print PPP "<META HTTP-EQUIV=\"Expires\" CONTENT=\"$EXPD\">\n" ;
+ print PPP $HEAD if $HEAD ;
print PPP "</HEAD>\n" ;
print PPP "<BODY BGCOLOR=\"#FFFFFF\">\n" ;
print PPP $LOGO ;
@@ -885,52 +889,52 @@
my $ccs = exists $CCS { $reg } ? $CCS { $reg } : $reg ;
$ccs = nam $reg,
- ( scalar @{ $itms } > 6
- ? sprintf "%s - %d sites"
- , $ccs, scalar @{ $itms }
- : $ccs
- ) ;
+ ( scalar @{ $itms } > 6
+ ? sprintf "%s - %d sites"
+ , $ccs, scalar @{ $itms }
+ : $ccs
+ ) ;
- my $attr3 = "COLSPAN=$COLS BGCOLOR=\"YELLOW\"" ;
+ my $attr3 = "COLSPAN=$COLS BGCOLOR=\"YELLOW\"" ;
printf PPP "<TR><TH $attr3>$ccs</TH></TR>\n" ;
- for my $itm ( sort by_type_site @{ $itms } )
- { my ( $type, $url, $site ) = @{ $itm } ;
- my ( $time, $stat, $hstp, $hsts, $vrfy ) ;
- my ( $pr_time, $pr_last, $pr_hstp, $pr_hsts ) ;
-
- print PPP "<TR>\n" ;
- printf PPP
- " <TD ALIGN=\"RIGHT\">%s %s</TD>\n"
- . " <TD>%s</TD>\n"
- , url ( $url , $site )
- , url ( home ( $url ), '@' )
- , $type
- ;
-
- if ( exists $RES { $url } )
- { ( $time, $stat, $vrfy, $hstp, $hsts ) = @{ $RES { $url } } ;
- $pr_time = $time =~ /^\d+$/
- ? diff $time, $^T - max_age2 : ' ' ;
- $pr_last = $vrfy =~ /^\d+$/
- ? diff $vrfy, $^T - max_vrfy : ' ' ;
+ for my $itm ( sort by_type_site @{ $itms } )
+ { my ( $type, $url, $site ) = @{ $itm } ;
+ my ( $time, $stat, $hstp, $hsts, $vrfy ) ;
+ my ( $pr_time, $pr_last, $pr_hstp, $pr_hsts ) ;
+
+ print PPP "<TR>\n" ;
+ printf PPP
+ " <TD ALIGN=\"RIGHT\">%s %s</TD>\n"
+ . " <TD>%s</TD>\n"
+ , url ( $url , $site )
+ , url ( home ( $url ), '@' )
+ , $type
+ ;
+
+ if ( exists $RES { $url } )
+ { ( $time, $stat, $vrfy, $hstp, $hsts ) = @{ $RES { $url } } ;
+ $pr_time = $time =~ /^\d+$/
+ ? diff $time, $^T - max_age2 : ' ' ;
+ $pr_last = $vrfy =~ /^\d+$/
+ ? diff $vrfy, $^T - max_vrfy : ' ' ;
$pr_hstp = show_hist $hstp ;
$pr_hsts = show_hist_age $hsts, $time ;
- }
- else
- { ( $pr_time, $pr_last, $pr_hstp, $pr_hsts, $stat ) =
- ( ' ', ' ', '', '', ' ' ) ;
- }
-
- $stat = RED $stat if $stat ne 'ok' ;
- printf PPP " <TD ALIGN=\"RIGHT\">%s<BR>%s</TD>\n"
- , $pr_time, $pr_hsts ;
- printf PPP " <TD ALIGN=\"RIGHT\">%s<BR>%s</TD>\n"
- , $pr_last, $pr_hstp ;
- printf PPP " <TD>%s</TD>\n", $stat ;
- print PPP "</TR>\n" ;
- }
+ }
+ else
+ { ( $pr_time, $pr_last, $pr_hstp, $pr_hsts, $stat ) =
+ ( ' ', ' ', '', '', ' ' ) ;
+ }
+
+ $stat = RED $stat if $stat ne 'ok' ;
+ printf PPP " <TD ALIGN=\"RIGHT\">%s<BR>%s</TD>\n"
+ , $pr_time, $pr_hsts ;
+ printf PPP " <TD ALIGN=\"RIGHT\">%s<BR>%s</TD>\n"
+ , $pr_last, $pr_hstp ;
+ printf PPP " <TD>%s</TD>\n", $stat ;
+ print PPP "</TR>\n" ;
+ }
}
print PPP "</TABLE>\n" ;
print PPP "</BLOCKQUOTE>\n" ;
@@ -1062,7 +1066,7 @@
</BLOCKQUOTE>
</BLOCKQUOTE>
-<H4>last probe, probe stats</H4>
+<H4>last probe, probe stats</H4>
<BLOCKQUOTE>
<B>Last probe</B> indicates when the last successful probe was made.
@@ -1072,7 +1076,7 @@
<FONT COLOR="RED"><B>failure</B></FONT>.
</BLOCKQUOTE>
-<H4>last stat</H4>
+<H4>last stat</H4>
<BLOCKQUOTE>
<B>Last stat</B> gives the status of the last probe.
@@ -1096,13 +1100,13 @@
if ( $res )
{ $WGT -> blocking ( 0 ) ;
$GET -> add ( $WGT ) ;
- $URL { $WGT } = $url ;
+ $URL { $WGT } = $url ;
}
else
{ err $url, 'no pipe' ; }
}
-sub get_date
+sub get_date
{ my $WGT = shift ;
my $url = $URL { $WGT } ;
my $time = undef ;
@@ -1113,13 +1117,12 @@
$WGT -> flush ;
$WGT -> close ;
- unless ( defined $time ) { return err $url, 'no time' ; }
+ return err $url, 'no time' unless defined $time ;
+ return err $url, "empty" if $time =~ /^\s*$/ ;
$time = ( split ' ', $time ) [ 0 ] ;
- if ( $time eq '' )
- { err $url, "empty" ; }
- elsif ( $time !~ /^\d+$/ )
+ if ( $time !~ /^\d+$/ )
{ $time = htmlquote $time ;
$time = substr ( $time, 0, 15 ) . '..' if length $time > 15 ;
err $url, "'$time'" ;
@@ -1136,61 +1139,61 @@
for my $url ( sort keys %LST )
{ if ( $opt{get} eq 'all' or ! exists $OLD { $url } )
{ push @QUE, $url ; }
- elsif ( $opt{get} eq 'update' )
- { my $stat = $OLD { $url } [ 1 ] ;
- my $vrfy = $OLD { $url } [ 2 ] ;
- my $lprb = $OLD { $url } [ 5 ] ;
- if ( ( $lprb eq 'undef'
- or aprx_le $lprb, $^T - tim_to_s $CNF { min_poll }
- )
- and ( $stat ne 'ok'
- or aprx_le $vrfy, $^T - tim_to_s $CNF { max_poll }
- )
- )
- { push @QUE, $url ; }
- elsif ( $CNF { randomize } and 0 == int rand $cnt_LST )
- { push @QUE, $url ; }
- else
- { $RES { $url } = $OLD { $url } ; }
- }
- else
- { Error "unknown opt_get '$opt{get}'" ; }
+ elsif ( $opt{get} eq 'update' )
+ { my $stat = $OLD { $url } [ 1 ] ;
+ my $vrfy = $OLD { $url } [ 2 ] ;
+ my $lprb = $OLD { $url } [ 5 ] ;
+ if ( ( $lprb eq 'undef'
+ or aprx_le $lprb, $^T - tim_to_s $CNF { min_poll }
+ )
+ and ( $stat ne 'ok'
+ or aprx_le $vrfy, $^T - tim_to_s $CNF { max_poll }
+ )
+ )
+ { push @QUE, $url ; }
+ elsif ( $CNF { randomize } and 0 == int rand $cnt_LST )
+ { push @QUE, $url ; }
+ else
+ { $RES { $url } = $OLD { $url } ; }
+ }
+ else
+ { Error "unknown opt_get '$opt{get}'" ; }
}
while ( @QUE )
{ while ( $GET -> count () < $PAR and @QUE )
{ my $url = shift @QUE ;
if ( gethost site $url )
- { start_date $url, $CMD ; }
- else
- { err $url, 'site not found' ; }
+ { start_date $url, $CMD ; }
+ else
+ { err $url, 'site not found' ; }
}
- my @can_read = $GET -> can_read ( 0 ) ;
+ my @can_read = $GET -> can_read ( 0 ) ;
+
+ printf "que %d, get %d, can %d\n",
+ scalar @QUE, $GET -> count (), scalar @can_read
+ if $opt{v} ;
- printf "que %d, get %d, can %d\n",
- scalar @QUE, $GET -> count (), scalar @can_read
- if $opt{v} ;
-
for my $can_read ( @can_read )
- { get_date $can_read ; }
+ { get_date $can_read ; }
sleep 1 ;
}
my $stop = time + $CNF { timeout } + 10 ;
-
+
while ( $GET -> count () and time < $stop )
{ sleep 1 ;
my @can_read = $GET -> can_read ( 0 ) ;
- printf "wait %2d, get %d, can %d\n",
- $stop - scalar time, $GET -> count (), scalar @can_read
- if $opt{v} ;
-
+ printf "wait %2d, get %d, can %d\n",
+ $stop - scalar time, $GET -> count (), scalar @can_read
+ if $opt{v} ;
+
for my $can_read ( @can_read )
- { get_date $can_read ; }
+ { get_date $can_read ; }
}
for my $WGT ( $GET -> handles () )
@@ -1250,7 +1253,7 @@
with the results. The subset contains the sites that are new, bad
and/or not probed for a specified time.
- When no 'get' option is specified, the program just generates a
+ When no 'get' option is specified, the program just generates a
new web page from the last known state.
The program checks the mirrors by running a (user specified)
@@ -1365,7 +1368,7 @@
Here it is assumed that each hour the root server writes
a timestamp in /path/to/archive/TIME, for instance with
a crontab entry like
-
+
42 * * * * perl -e 'printf "%s\n", time' > /path/to/archive/TIME
Mirmon reads one line of output from the probe and interprets
@@ -1411,14 +1414,12 @@
project_logo /icons/apache.gif
project_logo http://www.apache.org/icons/...
-=head2 htm_foot <html>
+=head2 htm_head <html>
- Optionally specify HTML to be placed near the bottom of the page.
+ Optionally specify some HTML to be placed before </HEAD>.
- htm_foot
- <HR>
- <A HREF="..."><IMG SRC="..." BORDER=0></A>
- <HR>
+ htm_head
+ <link REL=StyleSheet HREF="/style.css" TYPE="text/css">
=head2 htm_top <html>
@@ -1427,6 +1428,15 @@
htm_top testing 1, 2, 3
+=head2 htm_foot <html>
+
+ Optionally specify HTML to be placed near the bottom of the page.
+
+ htm_foot
+ <HR>
+ <A HREF="..."><IMG SRC="..." BORDER=0></A>
+ <HR>
+
=head2 put_histo top|bottom|nowhere
Optionally specify where the age histogram must be placed.
@@ -1579,7 +1589,7 @@
<A HREF="http://www.cs.uu.nl/">Computer Science Department</A>,
<A HREF="http://www.uu.nl/">Utrecht University</A>
<BR>
- $Id: mirmon,v 1.36 2004/12/28 17:54:10 henkp Exp $
+ $Id: mirmon,v 1.37 2006/12/04 15:16:11 henkp Exp henkp $
</BLOCKQUOTE>
=end html
