}
+
use DXVars;
use SysVar;
use BBS;
use WCY;
use BadWords;
-use Timer;
+use DXTimer;
use Route;
use Route::Node;
use Route::User;
$lock = $user->lockout;
} elsif ($basecall ne $call) {
# if there isn't a SSID on the $call, then try the base
- $user = DXUser::get_current($basecall);
- $lock = $user->lockout if $user;
+ my $luser = DXUser::get_current($basecall);
+ $lock = $luser->lockout if $luser;
}
# now deal with the lock
$l->close_server;
}
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) ended");
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
dbg("bye bye everyone - bye bye");
dbgclose();
Logclose();
#
#############################################################
+ chdir $root;
+
$starttime = $systime = time;
$systime_days = int ($systime / 86400);
$systime_daystart = $systime_days * 86400;
import Encode;
$can_encode = 1;
}
+
$gitbranch = 'none';
$gitversion = 'none';
- 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', '--long'], STDERR => 0);
- if ($desc) {
- my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
- $s ||= '';
- dbg("Git: $desc") if isdbg('git');
- dbg("Git: V=$v S=$s B=$b g=$g") if isdbg('git');
- $version = $v;
- $build = $b || 0;
- $gitversion = "$g\[r]";
- }
- my @branch = $repo->command([qw{branch}], STDERR=>0);
+ # determine the real Git build number and branch
+ my $desc;
+ eval {$desc = `git --git-dir=$root/.git describe --long`};
+ if (!$@ && $desc) {
+ my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+ $version = $v;
+ my $subversion = $s || 0; # not used elsewhere
+ $build = $b || 0;
+ $gitversion = "$g\[r]";
+ }
+ if (!$@) {
+ my @branch;
+
+ eval {@branch = `git --git-dir=$root/.git branch`};
+ unless ($@) {
for (@branch) {
my ($star, $b) = split /\s+/;
if ($star eq '*') {
}
}
}
+
$SIG{__DIE__} = $w;
}
# banner
my ($year) = (gmtime)[5];
$year += 1900;
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) started");
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes
DXCron::process(); # do cron jobs
RBN::process();
- Timer::handler();
+ DXTimer::handler();
DXLog::flushall();
}