projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put in some more loop protection.
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 4a4400a15f45c90fae90a76d36cd0fd515905efa..290838f40557838a3f772c19c7aaf029a9b2bb7b 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-61,13
+61,13
@@
use Filter;
use Local;
use Fcntl ':flock';
use Local;
use Fcntl ':flock';
-use Carp;
+use Carp
qw(cluck)
;
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.2
5
"; # the version no of the software
+$version = "1.2
9
"; # 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
@@
-105,9
+105,16
@@
sub rec
# set up the basic channel info - this needs a bit more thought - there is duplication here
if (!defined $dxchan) {
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
# set up the basic channel info - this needs a bit more thought - there is duplication here
if (!defined $dxchan) {
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+
+ # 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);
+ already_conn($conn, $call, $mess);
+ return;
+ }
# is there one already connected elsewhere in the cluster (and not a cluster)
# is there one already connected elsewhere in the cluster (and not a cluster)
- my $user = DXUser->get($call);
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
@@
-175,9
+182,21
@@
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);
+ 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);
+ Msg->event_loop(1, 0.05);
+ Msg->event_loop(1, 0.05);
DXUser::finish();
DXUser::finish();
+ dbg('chan', "DXSpider version $version ended");
Log('cluster', "DXSpider V$version stopped");
Log('cluster', "DXSpider V$version stopped");
+ dbgclose();
+ Logclose();
unlink $lockfn;
unlink $lockfn;
+# $SIG{__WARN__} = $SIG{__DIE__} = sub {my $a = shift; cluck($a); };
exit(0);
}
exit(0);
}
@@
-198,10
+217,20
@@
sub process_inqueue
my $data = $self->{data};
my $dxchan = $self->{dxchan};
my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
my $data = $self->{data};
my $dxchan = $self->{dxchan};
my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
+
+ # the above regexp must work
+ return unless ($sort && $call && $line);
+
+ # translate any crappy characters into hex characters
+ if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
+ $line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+# dbg('chan', "<- $sort $call **CRAP**: $line");
+# return;
+ }
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
-
+
# handle A records
my $user = $dxchan->user;
if ($sort eq 'A' || $sort eq 'O') {
# handle A records
my $user = $dxchan->user;
if ($sort eq 'A' || $sort eq 'O') {
@@
-314,6
+343,7
@@
dbg('local', "Local::init error $@") if $@;
# this, such as it is, is the main loop!
print "orft we jolly well go ...\n";
# this, such as it is, is the main loop!
print "orft we jolly well go ...\n";
+dbg('chan', "DXSpider version $version started...");
for (;;) {
my $timenow;
Msg->event_loop(1, 0.001);
for (;;) {
my $timenow;
Msg->event_loop(1, 0.001);