X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=2330bcda5639f5ae02986ce7119d206b5f1990b5;hb=1728c7c7a64eaf2852c490629f022c7e70bc46e2;hp=5e4dd4d9efcc92880361e07a55bba4298c78a249;hpb=a3fd9341b7ce57dcc058b82cfba3f40f15631241;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 5e4dd4d9..2330bcda 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -14,6 +14,8 @@ require 5.004; # make sure that modules are searched in the order local then perl BEGIN { + umask 002; + # root of directory tree for this system $root = "/spider"; $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'}; @@ -55,6 +57,7 @@ use Prefix; use Bands; use Geomag; use CmdAlias; +use Filter; use Local; use Fcntl ':flock'; @@ -64,7 +67,7 @@ package main; @inqueue = (); # the main input queue, an array of hashes $systime = 0; # the time now (in seconds) -$version = "1.23"; # the version no of the software +$version = "1.24"; # the version no of the software $starttime = 0; # the starting time of the cluster $lockfn = "cluster.lock"; # lock file name @@ -165,7 +168,12 @@ sub cease foreach $dxchan (DXChannel->get_all()) { disconnect($dxchan) unless $dxchan == $DXProt::me; } + Msg->event_loop(1, 0.05); + Msg->event_loop(1, 0.05); + Msg->event_loop(1, 0.05); + Msg->event_loop(1, 0.05); Log('cluster', "DXSpider V$version stopped"); + DXUser::finish(); unlink $lockfn; exit(0); } @@ -250,7 +258,7 @@ Bands::load(); # initialise User file system print "loading user file system ...\n"; -DXUser->init($userfn); +DXUser->init($userfn, 1); # start listening for incoming messages/connects print "starting listener ...\n";