projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we have a initial working loging in version. Doesn't do much, but its
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index fc2a0973e6c4a5b2641c0d2a762ede64fc746bd7..8097f6cd96c24621d6112b93e6594105bb8d269a 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-28,8
+28,8
@@
sub disconnect
{
my $dxchan = shift;
return if !defined $dxchan;
{
my $dxchan = shift;
return if !defined $dxchan;
- my
($user)
= $dxchan->{user};
- my
($conn)
= $dxchan->{conn};
+ my
$user
= $dxchan->{user};
+ my
$conn
= $dxchan->{conn};
$user->close() if defined $user;
$conn->disconnect() if defined $conn;
$dxchan->del();
$user->close() if defined $user;
$conn->disconnect() if defined $conn;
$dxchan->del();
@@
-46,8
+46,9
@@
sub rec
return;
}
return;
}
- # set up the basic channel info
+ # set up the basic channel info
- this needs a bit more thought - there is duplication here
if (!defined $dxchan) {
if (!defined $dxchan) {
+ my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
my $user = DXUser->get($call);
$user = DXUser->new($call) if !defined $user;
$dxchan = DXChannel->new($call, $conn, $user);
my $user = DXUser->get($call);
$user = DXUser->new($call) if !defined $user;
$dxchan = DXChannel->new($call, $conn, $user);
@@
-74,6
+75,7
@@
sub cease
foreach $dxchan (DXChannel->get_all()) {
disconnect($dxchan);
}
foreach $dxchan (DXChannel->get_all()) {
disconnect($dxchan);
}
+ exit(0);
}
# this is where the input queue is dealt with and things are dispatched off to other parts of
}
# this is where the input queue is dealt with and things are dispatched off to other parts of
@@
-85,7
+87,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)(\S+)
\
|(.*)$/;
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
print DEBUG atime, " < $sort $call $line\n" if defined DEBUG;
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
print DEBUG atime, " < $sort $call $line\n" if defined DEBUG;
@@
-96,7
+98,7
@@
sub process_inqueue
my $user = $dxchan->{user};
$user->{sort} = 'U' if !defined $user->{sort};
if ($user->{sort} eq 'U') {
my $user = $dxchan->{user};
$user->{sort} = 'U' if !defined $user->{sort};
if ($user->{sort} eq 'U') {
- $dxchan->send_
later('D', m
('l2', $call, $mycall, $myqth));
+ $dxchan->send_
now('D', msg
('l2', $call, $mycall, $myqth));
$dxchan->send_file($motd) if (-e $motd);
}
} elsif (sort eq 'D') {
$dxchan->send_file($motd) if (-e $motd);
}
} elsif (sort eq 'D') {
@@
-113,7
+115,7
@@
sub process_inqueue
#############################################################
# open the debug file, set various FHs to be unbuffered
#############################################################
# open the debug file, set various FHs to be unbuffered
-open(DEBUG, ">>$debugfn") or die "can't open $debugfn($!)
\n
";
+open(DEBUG, ">>$debugfn") or die "can't open $debugfn($!)";
select DEBUG; $| = 1;
select STDOUT; $| = 1;
select DEBUG; $| = 1;
select STDOUT; $| = 1;