X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=5b65717e705ebee2634f3c87f3cc6b2e3555d55b;hb=7a395060c59baffc5d2a57c2dbcbed89aa85dd1e;hp=059a24a929997f5ca5c8cb150490803d823b605d;hpb=cf3be2ab23c544fdb17d40cbff47f8a6631e9fdb;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 059a24a9..5b65717e 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -34,11 +34,14 @@ BEGIN { # 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 = ; - 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) $!"; @@ -297,7 +300,7 @@ sub cease $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(); @@ -386,7 +389,7 @@ DXXml::init(); # 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 @@ -564,6 +567,8 @@ for (;;) { AGWMsg::process(); BPQMsg::process(); + DXLog::flushall(); + if (defined &Local::process) { eval { Local::process(); # do any localised processing