From 0831a1b786d5f3e83aef6ee603b470f86310e8cf Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Wed, 15 Feb 2017 22:45:36 +0000 Subject: [PATCH] fix SysVar.pm problems (maybe) --- Changes | 3 +++ UPGRADE.mojo | 2 ++ perl/cluster.pl | 11 ++++++++--- perl/rbn.pl | 9 +++++++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Changes b/Changes index 5d16d91f..60e1d87c 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +15Feb17======================================================================= +1. Update UPGRADE.mojo a bit +2. Fix(?) problems picking up SysVar.pm variables. 02Jan17======================================================================= 1. Add CTY-2615 prefixes 2. Add rbn.pl - an experimental rbn deduplicating spot filter. diff --git a/UPGRADE.mojo b/UPGRADE.mojo index 6e5047fb..c6d3d339 100644 --- a/UPGRADE.mojo +++ b/UPGRADE.mojo @@ -42,6 +42,8 @@ Prerequisites: Install cpamminus: sudo apt-get install cpanminus +or + wget -O - https://cpanmin.us | perl - --sudo App::cpanminus or sudo apt-get install curl curl -L https://cpanmin.us | perl - --sudo App::cpanminus diff --git a/perl/cluster.pl b/perl/cluster.pl index 4222132c..ca73a824 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -19,6 +19,12 @@ use warnings; BEGIN { umask 002; + # take into account any local::lib that might be present + eval { + require local::lib; + }; + import local::lib unless ($@); + # root of directory tree for this system $root = "/spider"; $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'}; @@ -59,12 +65,11 @@ BEGIN { $systime = time; } - -use Mojo::IOLoop; - use DXVars; use SysVar; +use Mojo::IOLoop; + use Msg; use IntMsg; use Internet; diff --git a/perl/rbn.pl b/perl/rbn.pl index ee960f4d..8438b8e6 100755 --- a/perl/rbn.pl +++ b/perl/rbn.pl @@ -74,8 +74,8 @@ for ($attempts = 1; $attempts <= 5; ++$attempts) { die "ADMIN,Cannot connect to $host:$port after 5 attempts $!" unless $sock; say "ADMIN,connected" if $dbg; -print $sock "$mycall\r\n"; -say "ADMIN,call sent" if $dbg; +#print $sock "$mycall\r\n"; +#say "ADMIN,call $mycall sent" if $dbg; my %d; my %spot; @@ -92,6 +92,11 @@ while (<$sock>) { # parse line say "RAW,$_" if $wantraw; + if (/call:/) { +print $sock "$mycall\r\n"; +say "ADMIN,call $mycall sent" if $dbg; + } + my (undef, undef, $origin, $qrg, $call, $mode, $s, $m, $spd, $u, $sort, $t, $tx) = split /[:\s]+/; if ($t || $tx) { -- 2.43.0