use CGI::SpeedyCGI qw/:standard -no_xhtml/;
use CGI qw/:standard -no_xhtml/;
use POSIX;
+use MD5;
sub fail ($) {
print(header(-status=>500),
}
}
-our @news_graphs;
+our %news_sources;
foreach my $src (<$SELF/data/news/*.rrd>) {
my $site= $src;
my $newsite= $news_name_map{$site,$inout};
$site= $newsite if defined $newsite;
next if $site eq '-';
- #my $sk= join '.', reverse split /\./, $site;
+ push @{ $news_sources{$site}{$inout} }, $src;
+}
+
+our @news_graphs;
+
+foreach my $site (keys %news_sources) {
my $sk= $site;
- $sk .= " $&" if $sk =~ s/^[^.]*(?:news|nntp|peer)[^.]*\.//;
- $sk .= " $inout";
- push @news_graphs, [ $sk, $site, $inout, $src ];
+ for (;;) {
+ last unless $sk =~
+ s/^[^.]*(?:chiark|greenend|news|nntp|peer|feed|in|out)[^.]*\.//;
+ $sk .= " $&";
+ }
+ foreach my $inout (keys %{ $news_sources{$site} }) {
+ push @news_graphs, [ "$sk $inout", $site, $inout ];
+ }
}
foreach my $siteinfo (sort { $a->[0] cmp $b->[0] } @news_graphs) {
- my ($sortkey, $site, $inout, $src)= @$siteinfo;
+ my ($sortkey, $site, $inout)= @$siteinfo;
+ my @sources= @{ $news_sources{$site}{$inout} };
+
+ my @vals= $inout eq 'out'
+ ? qw(missing deferred unwanted accepted rejected body_missing)
+ : qw(accepted refused rejected duplicate
+ accepted_size duplicate_size);
+ my @defs;
+ foreach my $val (@vals) {
+ my $def= "CDEF:$val=0";
+ foreach my $si (0..$#sources) {
+ my $src= $sources[$si];
+ my $tvar= "${val}_${si}";
+ push @defs, "DEF:$tvar=$src:$val:AVERAGE";
+ $def .= ",$tvar,ADDNAN";
+ }
+ push @defs, $def;
+ if ($val =~ m/_size$/) {
+ push @defs, "CDEF:kb_$`=$val,1024,/";
+ }
+ }
graph_of_group("News", $site, $inout,
{
Units => '[art/s]',
TimeRanges => [ map { $_*86400 } qw(1 7 31), 366, 366*3 ]
}, $inout eq 'out' ?
[
- (map { "DEF:$_=$src:$_:AVERAGE" }
- qw(missing deferred unwanted accepted rejected body_missing)),
+ @defs,
"AREA:accepted#00f:ok",
"AREA:body_missing#ff0:miss:STACK",
"AREA:rejected#f00:rej:STACK",
"AREA:deferred#ddd:defer:STACK",
] :
[
- (map { "DEF:$_=$src:$_:AVERAGE" }
- qw(accepted refused rejected duplicate)),
- (map { ("DEF:bytes_$_=$src:${_}_size:AVERAGE",
- "CDEF:kb_$_=bytes_$_,1024,/")
- } qw(accepted duplicate)),
+ @defs,
"AREA:accepted#00f:ok:STACK",
"AREA:rejected#f00:rej:STACK",
"AREA:duplicate#000:dupe:STACK",
our $group= param('graph');
+my $defwidth= 370;
+my $defheight= 200;
+
our $elem= param('elem');
if (defined $elem) {
my $g= $graphs{$section,$group,$elem};
die unless $g;
- my $width= num_param('w',370,100,1600);
- my $height= num_param('h',200,100,1600);
+ my $width= num_param('w',$defwidth,100,1600);
+ my $height= num_param('h',$defheight,100,1600);
my $sloth= param('sloth');
die unless defined $sloth;
my $end= $g->{TimeRanges}[$sloth];
die unless defined $end;
- my $cacheid= "$section!$group!$elem!$sloth!$width!$height";
- my $cachepath= "cache/$cacheid.png";
-
my @args= @{ $g->{Args} };
s,\<interval/(\d+)\>, $end/$1 ,ge foreach @args;
unshift @args, qw(--end now --start), "end-${end}s";
unshift @args, '-t', $title, '-w',$width, '-h',$height;
unshift @args, qw(-a PNG --full-size-mode);
+ my $cacheid= "$section!$group!$elem!$sloth!$width!$height!";
+ $cacheid .= unpack "H*", MD5->hash(join '\0', @args);
+ my $cachepath= "cache/$cacheid.png";
+
if (param('debug')) {
print((join "\n",@args),"\n"); exit 0;
}
my $imgurl= "$self?graph=$detail§ion=$section".
"&sloth=$tsloth&elem=$elem";
print a({href=>"$imgurl&w=780&h=800"},
- img({src=>$imgurl, alt=>''}));
+ img({src=>$imgurl, alt=>'',
+ width=>$defwidth, height=>$defheight}));
}
}
print end_html();
foreach my $elem (@$elems) {
my $g= $graphs{$ref_section,$ref_group,$elem};
print img({src=>"$imgurl&elem=$elem&sloth=".($sloth + $g->{Slower}),
- alt=>''});
+ alt=>'', width=>$defwidth, height=>$defheight});
}
print "</span>";
print "</a>\n";