require 5.004;
+package main;
+
+# set default paths, these should be overwritten by DXVars.pm
+use vars qw($data $system $cmd $localcmd $userfn $clusteraddr $clusterport $yes $no $user_interval $lang);
+
+$lang = 'en'; # default language
+$clusteraddr = '127.0.0.1'; # cluster tcp host address - used for things like console.pl
+$clusterport = 27754; # cluster tcp port
+$yes = 'Yes'; # visual representation of yes
+$no = 'No'; # ditto for no
+$user_interval = 11*60; # the interval between unsolicited prompts if no traffic
+
+
# make sure that modules are searched in the order local then perl
BEGIN {
umask 002;
mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd";
+ $data = "$root/data";
+ $system = "$root/sys";
+ $cmd = "$root/cmd";
+ $localcmd = "$root/local_cmd";
+ $userfn = "$data/users";
# try to create and lock a lockfile (this isn't atomic but
# should do for now
$lockfn = "$root/local/cluster.lck"; # lock file name
- if (-e $lockfn) {
+ if (-w $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
- chomp $pid;
- die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+ if ($pid) {
+ chomp $pid;
+ die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+ }
+ unlink $lockfn;
close CLLOCK;
}
open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
use IO::File;
use Fcntl ':flock';
use POSIX ":sys_wait_h";
-use Version;
use Local;
use strict;
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
+ $zombies $root @listeners $lang $myalias @debug $userfn
+ $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
$can_encode $maxconnect_user $maxconnect_node
);
# takes the no of references in the routing table above these numbers
# then the connection is refused. This only affects INCOMING connections.
+use vars qw($version $subversion $build $gitversion $gitbranch);
+
# send a message to call on conn and disconnect
sub already_conn
{
return;
}
if ($bumpexisting) {
- my $ip = $conn->{peerhost} || 'unknown';
+ my $ip = $conn->peerhost || 'unknown';
$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
$dxchan->disconnect;
my $lock = $user->lockout if $user;
if ($baseuser && $baseuser->lockout || $lock) {
if (!$user || !defined $lock || $lock) {
- my $host = $conn->{peerhost} || "unknown";
+ my $host = $conn->peerhost || "unknown";
LogDbg('DXCommand', "$call on $host is locked out, disconnected");
$conn->disconnect;
return;
$l->close_server;
}
- LogDbg('cluster', "DXSpider V$version, build $subversion.$build ended");
+ LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitbranch/$gitversion) ended");
dbgclose();
Logclose();
$dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
}
-# try to load Encode
+# try to load Encode and Git
{
local $^W = 0;
my $w = $SIG{__DIE__};
import Encode;
$can_encode = 1;
}
+ eval { require Git; };
+ unless ($@) {
+ import Git;
+
+ # determine the real version number
+ $gitbranch = 'none';
+ $gitversion = 'none';
+ my $repo = Git->repository(Directory => "$root/.git");
+ if ($repo) {
+ my $desc = $repo->command_oneline(['describe'], STDERR => 0);
+ if ($desc) {
+ my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+ $version = $v;
+ $subversion = $s || 0;
+ $build = $b || 0;
+ $gitversion = "$g\[r]";
+ }
+ }
+ my @branch = $repo->command([qw{branch}], STDERR=>0);
+ for (@branch) {
+ my ($star, $b) = split /\s+/;
+ if ($star eq '*') {
+ $gitbranch = $b;
+ last;
+ }
+ }
+
+ }
$SIG{__DIE__} = $w;
}
# banner
my ($year) = (gmtime)[5];
$year += 1900;
-LogDbg('cluster', "DXSpider V$version, build $subversion.$build started");
+LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitbranch/$gitversion) started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes
dbg("loading user file system ...");
DXUser->init($userfn, 1);
+
# look for the sysop and the alias user and complain if they aren't there
{
die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
my $ref = DXUser::get($mycall);
die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+ my $oldsort = $ref->sort;
+ if ($oldsort ne 'S') {
+ $ref->sort('S');
+ dbg "Resetting node type from $oldsort -> DXSpider ('S')";
+ }
$ref = DXUser::get($myalias);
die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+ $oldsort = $ref->sort;
+ if ($oldsort ne 'U') {
+ $ref->sort('U');
+ dbg "Resetting sysop user type from $oldsort -> User ('U')";
+ }
}
# start listening for incoming messages/connects
AGWMsg::process();
BPQMsg::process();
+ DXLog::flushall();
+
if (defined &Local::process) {
eval {
Local::process(); # do any localised processing
projects / spider.git / blobdiff