projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add branch to sh/ver, rm redundant module
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 7492368a9da75b1a78797be9e1381bc4ae7f16bb..5baf02973ac49a4c385c95d7fc1dcf8121febd09 100755
(executable)
--- 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 IO::File;
use Fcntl ':flock';
use POSIX ":sys_wait_h";
-use Version;
use Web;
use Web;
+use vars qw($version $build $gitversion $gitbranch);
+
use Local;
use Local;
@@
-408,7
+409,7
@@
sub cease
$l->close_server;
}
$l->close_server;
}
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitversion) ended");
+ LogDbg('cluster', "DXSpider V$version, build $build (git: $git
branch/$git
version) ended");
dbg("bye bye everyone - bye bye");
dbgclose();
Logclose();
dbg("bye bye everyone - bye bye");
dbgclose();
Logclose();
@@
-492,6
+493,8
@@
sub setup_start
import Encode;
$can_encode = 1;
}
import Encode;
$can_encode = 1;
}
+ $gitbranch = 'none';
+ $gitversion = 'none';
eval { require Git; };
unless ($@) {
import Git;
eval { require Git; };
unless ($@) {
import Git;
@@
-509,6
+512,14
@@
sub setup_start
$build = $b || 0;
$gitversion = "$g\[r]";
}
$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;
}
}
$SIG{__DIE__} = $w;
@@
-520,7
+531,7
@@
sub setup_start
# banner
my ($year) = (gmtime)[5];
$year += 1900;
# 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: $git
branch/$git
version) started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes