X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=dcba350a97297ed88899c9cdb0df94ac9b247b24;hp=2e90e79cf05aa8d03bfb4ec35d2b675e354d646b;hb=1e23eeb797f1bbe48e3d3977d864a3d148b71597;hpb=847531a8ed9aff2c7d50e17aa08c9f24fc28a265 diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm index 2e90e79..dcba350 100644 --- a/lib/ZOOM/IRSpy.pm +++ b/lib/ZOOM/IRSpy.pm @@ -1,4 +1,3 @@ -# $Id: IRSpy.pm,v 1.90 2008-07-16 11:42:13 mike Exp $ package ZOOM::IRSpy; @@ -22,8 +21,11 @@ use ZOOM::IRSpy::Utils qw(cql_target render_record modify_xml_document); our @ISA = qw(); -our $VERSION = '1.01'; +our $VERSION = '1.02'; our $irspy_to_zeerex_xsl = dirname(__FILE__) . '/../../xsl/irspy2zeerex.xsl'; +our $debug = 0; +our $xslt_max_depth = 250; +our $max_timeout_errors = 3; # Enumeration for callback functions to return @@ -69,6 +71,7 @@ sub new { my $class = shift(); my($dbname, $user, $password, $activeSetSize) = @_; + my @options; push @options, (user => $user, password => $password) if defined $user; @@ -78,10 +81,15 @@ sub new { my $xslt = new XML::LibXSLT; + # raise the maximum number of nested template calls and variables/params (default 250) + warn "raise the maximum number of nested template calls: $xslt_max_depth\n" if $debug; + $xslt->max_depth($xslt_max_depth); + $xslt->register_function($ZOOM::IRSpy::Utils::IRSPY_NS, 'strcmp', \&ZOOM::IRSpy::Utils::xslt_strcmp); my $libxml = new XML::LibXML; + warn "use irspy_to_zeerex_xsl xslt sheet: $irspy_to_zeerex_xsl\n" if $debug; my $xsl_doc = $libxml->parse_file($irspy_to_zeerex_xsl); my $irspy_to_zeerex_style = $xslt->parse_stylesheet($xsl_doc); @@ -108,6 +116,16 @@ sub new { return $this; } +# wrapper to read the IRSpy database name from environment variable / apache config +sub connect_to_registry { + my %args = @_; + + # XXX: we could also handle her: user, password, elementSetName + + my $database = $ENV{IRSpyDbName} || "localhost:8018/IR-Explain---1"; + + return $database; +} sub log { my $this = shift(); @@ -309,7 +327,7 @@ sub _rewrite_irspy_record { my $_reliabilityField = { reliability => [ reliability => 0, "Calculated reliability of server", - "e:metaInfo/i:reliability" ], + "e:serverInfo/e:reliability" ], }; sub _rewrite_zeerex_record { @@ -417,6 +435,8 @@ sub check { my $timeout = $this->{timeout}; $this->log("irspy", "beginnning with test '$topname' (timeout $timeout)"); + $timeout = 2; + my $nskipped = 0; my @conn = @{ $this->{connections} }; @@ -425,8 +445,12 @@ sub check { while (1) { my @copy_conn = @conn; # avoid alias problems after splice() my $nconn = scalar(@copy_conn); + + foreach my $i0 (0 .. $#copy_conn) { my $conn = $copy_conn[$i0]; + #warn Dumper($conn); + #print "connection $i0 of $nconn/", scalar(@conn), " is $conn\n"; next if !defined $conn; if (!$conn->current_task()) { @@ -441,6 +465,10 @@ sub check { $conn->log("irspy_test", "checking for next test after '$address'"); $nextaddr = $this->_next_test($address); + if ($nextaddr && $conn->record->zoom_error->{TIMEOUT} >= $max_timeout_errors) { + $conn->log("irspy", "Got to many timeouts, stop testing: " . $conn->record->zoom_error->{TIMEOUT}); + $nextaddr = ""; + } } if (!defined $nextaddr) { $conn->log("irspy", "has no more tests: removing");