fix (bandaid for now) sh/cl local counts

diff --git a/Changes b/Changes
index ef150a2a6a844eaf836b342dca4ecd01cece4598..d8e3fcc14b9cf409447c4a9a0d7081e85cb09f02 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+07Jul20=======================================================================
+1. Fix show/cluster command to take into account the presence of skimmer nodes
+   which are a new category of thing which is neither a node nor a user.
 06Jul20=======================================================================
 1. Update console.pl (dx) to improve scrolling as keyboard speed. 
 05Jul20=======================================================================

diff --git a/cmd/show/cluster.pl b/cmd/show/cluster.pl
index ea137856504d369cfb90b31789edf5369a9fe988..7ebfb946f5baa0912831a98e98da2f8be8c8db65 100644 (file)
--- a/cmd/show/cluster.pl
+++ b/cmd/show/cluster.pl
@@ -6,4 +6,7 @@ my $self = shift;
 
 my ($nodes, $tot, $users, $maxlocalusers, $maxusers, $uptime, $localnodes) = Route::cluster();
 
+$localnodes = $main::routeroot->nodes;
+$users = $main::routeroot->users;
+
 return (1, $self->msg('cluster', $localnodes, $nodes, $users, $tot, $maxlocalusers, $maxusers, $uptime));

diff --git a/perl/Route.pm b/perl/Route.pm
index 9e5926442b4f40e0e409bb4224cdc6927f44d498..3f264846bd74ff4210b9276e7c6ce7e4e542ab44 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -272,10 +272,10 @@ sub cluster
 {
        my $nodes = Route::Node::count();
        my $tot = Route::User::count();
-       my ($users, $maxlocalusers) = DXCommandmode::user_count();
+       my ($users, $maxlocalusers) = DXCommandmode::user_count(); # the user count is wrong because of skimmers
        my $maxusers = Route::User::max();
        my $uptime = main::uptime();
-       my $localnodes = $DXChannel::count - $users;
+       my $localnodes = $DXChannel::count - $users;   # this is now wrong because of skimmers
        
        return ($nodes, $tot, $users, $maxlocalusers, $maxusers, $uptime, $localnodes);