-# $Id: IRSpy.pm,v 1.4 2006-06-21 14:35:03 mike Exp $
+# $Id: IRSpy.pm,v 1.7 2006-07-18 11:10:38 mike Exp $
package ZOOM::IRSpy;
=cut
-BEGIN { ZOOM::Log::mask_str("irspy") }
+BEGIN {
+ ZOOM::Log::mask_str("irspy");
+ ZOOM::Log::mask_str("irspy_test");
+ ZOOM::Log::mask_str("irspy_debug");
+}
sub new {
my $class = shift();
my @targets = split /\s+/, $targetList;
my @qlist;
foreach my $target (@targets) {
- my($host, $port, $db) = ($target =~ /(.*?):(.*?)\/(.*)/);
- if (!defined $host) {
- $port = 210;
- ($host, $db) = ($target =~ /(.*?)\/(.*)/);
- $this->log("irspy", "rewrote '$target' to '$host:$port/$db'");
- $target = "$host:$port/$db";
+ my($host, $port, $db, $newtarget) = _parse_target_string($target);
+ if ($newtarget ne $target) {
+ $this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
+ $target = $newtarget; ### Does this get written through the ref?
}
- die "invalid target string '$target'"
- if !defined $host;
push @qlist,
(qq[(host = "$host" and port = "$port" and path="$db")]);
}
}
+# Also used by ZOOM::IRSpy::Record
+sub _parse_target_string {
+ my($target) = @_;
+
+ my($host, $port, $db) = ($target =~ /(.*?):(.*?)\/(.*)/);
+ if (!defined $host) {
+ $port = 210;
+ ($host, $db) = ($target =~ /(.*?)\/(.*)/);
+ $target = "$host:$port/$db";
+ }
+ die "invalid target string '$target'"
+ if !defined $host;
+
+ return ($host, $port, $db, $target);
+}
+
+
# There are two cases.
#
# 1. A specific set of targets is nominated on the command line.
foreach my $target (keys %target2record) {
my $record = $target2record{$target};
if (!defined $record) {
- $this->log("irspy", "made new record for '$target'");
+ $this->log("irspy_debug", "made new record for '$target'");
$target2record{$target} = new ZOOM::IRSpy::Record($target);
} else {
- $this->log("irspy", "using existing record for '$target'");
+ $this->log("irspy_debug", "using existing record for '$target'");
}
}
my($tname) = @_;
eval {
- require "ZOOM/IRSpy/Test/$tname.pm";
+ my $slashSeperatedTname = $tname;
+ $slashSeperatedTname =~ s/::/\//g;
+ require "ZOOM/IRSpy/Test/$slashSeperatedTname.pm";
}; if ($@) {
$this->log("warn", "can't load test '$tname': skipping",
$@ =~ /^Can.t locate/ ? () : " ($@)");
sub record {
my $this = shift();
my($target) = @_;
- return $this->{target2record}->{$target};
+
+ if (ref($target) && $target->isa("ZOOM::Connection")) {
+ # Can be called with a Connection instead of a target-name
+ my $conn = $target;
+ $target = $conn->option("host");
+ $this->log("irspy_debug", "record() resolved $conn to '$target'");
+ }
+
+ return $this->{target2record}->{lc($target)};
}