projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
got rid of warning in date conversion
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 94fe0478664473b657b6297b9189ae8e091c1696..fdfff04f110abb24807561310a44543b76e96f24 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-67,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.3
0
"; # the version no of the software
+$version = "1.3
1
"; # 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
@@
-89,6
+89,8
@@
sub already_conn
sleep(1);
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
sleep(1);
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
+ sleep(1);
+ $conn->disconnect;
}
# handle incoming messages
}
# handle incoming messages
@@
-109,7
+111,7
@@
sub rec
# is there one already connected to me ?
my $user = DXUser->get($call);
if (DXChannel->get($call)) {
# is there one already connected to me ?
my $user = DXUser->get($call);
if (DXChannel->get($call)) {
- my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+ my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
}
already_conn($conn, $call, $mess);
return;
}
@@
-230,7
+232,7
@@
sub process_inqueue
my $data = $self->{data};
my $dxchan = $self->{dxchan};
my $data = $self->{data};
my $dxchan = $self->{dxchan};
- my ($sort, $call, $line) = $data =~ /^(\w)(
\S
+)\|(.*)$/;
+ my ($sort, $call, $line) = $data =~ /^(\w)(
[A-Z0-9\-]
+)\|(.*)$/;
# the above regexp must work
return unless ($sort && $call && $line);
# the above regexp must work
return unless ($sort && $call && $line);
@@
-374,6
+376,7
@@
for (;;) {
DXCommandmode::process(); # process ongoing command mode stuff
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
DXCommandmode::process(); # process ongoing command mode stuff
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
+ DXMsg::process();
eval {
Local::process(); # do any localised processing
};
eval {
Local::process(); # do any localised processing
};