projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed user filtering
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 0de499f62a4784b9cdbbb7271977374b04ba3a50..ebe7ce0a51f9967ea56e58eeae5e9684fedeb986 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
4
"; # the version no of the software
+$version = "1.2
7
"; # 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
@@
-156,6
+159,9
@@
sub login
sub cease
{
my $dxchan;
sub cease
{
my $dxchan;
+
+ $SIG{'TERM'} = 'IGNORE';
+ $SIG{'INT'} = 'IGNORE';
eval {
Local::finish(); # end local processing
eval {
Local::finish(); # end local processing
@@
-169,6
+175,7
@@
sub cease
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
+ DXUser::finish();
Log('cluster', "DXSpider V$version stopped");
unlink $lockfn;
exit(0);
Log('cluster', "DXSpider V$version stopped");
unlink $lockfn;
exit(0);
@@
-331,5
+338,7
@@
for (;;) {
last if --$decease <= 0;
}
}
last if --$decease <= 0;
}
}
+cease(0);
+exit(0);