X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=5baf02973ac49a4c385c95d7fc1dcf8121febd09;hb=2462f5e2370ec0bdafe12deea0d131ea3718fb29;hp=7492368a9da75b1a78797be9e1381bc4ae7f16bb;hpb=ca828d0e2a21d9a6540361ca4878df71f125e120;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 7492368a..5baf0297 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -153,9 +153,10 @@ use Data::Dumper;
 use IO::File;
 use Fcntl ':flock';
 use POSIX ":sys_wait_h";
-use Version;
 use Web;
 
+use vars qw($version $build $gitversion $gitbranch);
+
 use Local;
 
 
@@ -408,7 +409,7 @@ sub cease
 		$l->close_server;
 	}
 
-	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitversion) ended");
+	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) ended");
 	dbg("bye bye everyone - bye bye");
 	dbgclose();
 	Logclose();
@@ -492,6 +493,8 @@ sub setup_start
 			import Encode;
 			$can_encode = 1;
 		}
+		$gitbranch = 'none';
+		$gitversion = 'none';
 		eval { require Git; };
 		unless ($@) {
 			import Git;
@@ -509,6 +512,14 @@ sub setup_start
 					$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;
@@ -520,7 +531,7 @@ sub setup_start
 	# banner
 	my ($year) = (gmtime)[5];
 	$year += 1900;
-	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitversion) started");
+	LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) started");
 	dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
 
 	# load Prefixes