projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for SIMPLEROUTE merge (more files)
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index fe881f1eaa78a4dde7b525a227f98af3816930ab..c517a23179d9d2eb35c8849bde6d57490bca12e0 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-107,13
+107,14
@@
use Data::Dumper;
use IO::File;
use Fcntl ':flock';
use POSIX ":sys_wait_h";
use IO::File;
use Fcntl ':flock';
use POSIX ":sys_wait_h";
+use Version;
use Local;
package main;
use strict;
use Local;
package main;
use strict;
-use vars qw(@inqueue $systime $
version $
starttime $lockfn @outstanding_connects
+use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects
$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
@@
-121,7
+122,6
@@
use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
@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.53"; # the version no of the software
$starttime = 0; # the starting time of the cluster
#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
$starttime = 0; # the starting time of the cluster
#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
@@
-130,12
+130,6
@@
$bumpexisting = 1; # 1 = allow new connection to disconnect old, 0 - don't al
$allowdxby = 0; # 1 = allow "dx by <othercall>", 0 - don't allow it
$allowdxby = 0; # 1 = allow "dx by <othercall>", 0 - don't allow it
-use vars qw($VERSION $BRANCH $build $branch);
-($VERSION, $BRANCH) = dxver( q$Revision$);
-$main::build -= 2; # fudge (put back for now)
-
-
-
# send a message to call on conn and disconnect
sub already_conn
{
# send a message to call on conn and disconnect
sub already_conn
{
@@
-344,10
+338,6
@@
foreach (@debug) {
}
STDOUT->autoflush(1);
}
STDOUT->autoflush(1);
-# calculate build number
-$build += $main::version;
-$build = "$build.$branch" if $branch;
-
# try to load the database
if (DXSql::init($dsn)) {
$dbh = DXSql->new($dsn);
# try to load the database
if (DXSql::init($dsn)) {
$dbh = DXSql->new($dsn);
@@
-462,7
+452,7
@@
DXProt->init();
# put in a DXCluster node for us here so we can add users and take them away
$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($main::me->here)|Route::conf($main::me->conf));
# put in a DXCluster node for us here so we can add users and take them away
$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($main::me->here)|Route::conf($main::me->conf));
-$routeroot->do_pc9
2
(1);
+$routeroot->do_pc9
x
(1);
$routeroot->via_pc92(1);
# make sure that there is a routing OUTPUT node default file
$routeroot->via_pc92(1);
# make sure that there is a routing OUTPUT node default file