# 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) $!";
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;
# (fairly) politely disconnect people that are connected to too many other places at once
my $r = Route::get($call);
- if ($conn->{sort} =~ /^I/ && $r && $user) {
+ if ($conn->{sort} && $conn->{sort} =~ /^I/ && $r && $user) {
my @n = $r->parents;
my $m = $r->isa('Route::Node') ? $maxconnect_node : $maxconnect_user;
my $c = $user->maxconnect;
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: $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
+ 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]";
+ }
+ }
+ }
$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: $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