projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added new DXUser with homemade data->ref and ref->data routines
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 5e4dd4d9efcc92880361e07a55bba4298c78a249..2330bcda5639f5ae02986ce7119d206b5f1990b5 100755
(executable)
--- 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 {
# 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'};
# 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 Bands;
use Geomag;
use CmdAlias;
+use Filter;
use Local;
use Fcntl ':flock';
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)
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.2
3
"; # the version no of the software
+$version = "1.2
4
"; # the version no of the software
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
$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;
}
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");
Log('cluster', "DXSpider V$version stopped");
+ DXUser::finish();
unlink $lockfn;
exit(0);
}
unlink $lockfn;
exit(0);
}
@@
-250,7
+258,7
@@
Bands::load();
# initialise User file system
print "loading user file system ...\n";
# 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";
# start listening for incoming messages/connects
print "starting listener ...\n";