Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
trackrdrd
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
trackrdrd
Commits
afb8eeb7
Commit
afb8eeb7
authored
Sep 22, 2012
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trackrdrd: -V emits a revision name derived from the git commit
(as in Varnish)
parent
399112b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
6 deletions
+39
-6
Makefile.am
src/Makefile.am
+37
-5
trackrdrd.c
src/trackrdrd.c
+2
-1
No files found.
src/Makefile.am
View file @
afb8eeb7
...
...
@@ -2,15 +2,13 @@ INCLUDES = -I$(VARNISHSRC)/include -I$(VARNISHSRC)
bin_PROGRAMS
=
trackrdrd
nodist_trackrdrd_SOURCES
=
revision.h
trackrdrd_SOURCES
=
\
trackrdrd.h
\
trackrdrd.c
\
parse.c
\
log.c
# $(VARNISHSRC)/lib/libvarnish/assert.c \
# $(VARNISHSRC)/lib/libvarnish/flopen.c \
# $(VARNISHSRC)/lib/libvarnish/version.c \
# $(VARNISHSRC)/lib/libvarnish/vsb.c \
# $(VARNISHSRC)/lib/libvarnish/vpf.c
trackrdrd_LDADD
=
\
$(VARNISHSRC)
/lib/libvarnishcompat/libvarnishcompat.la
\
...
...
@@ -20,3 +18,37 @@ trackrdrd_LDADD = \
check
:
test
/regress.sh
# Derive a revision name from the git commit
# Adopted from Varnish include/Makefile.am
BUILT_SOURCES
=
revision.h
MAINTAINERCLEANFILES
=
revision.h
revision.h
:
FORCE
@
if
[
-d
"
$(top_srcdir)
/../.git"
]
;
then
\
V
=
"
$$
(git show -s --pretty=format:%h)"
\
H
=
"
$$
(head -n 1 revision.h 2>/dev/null || true)"
;
\
if
[
"/*
$$
V */"
!=
"
$$
H"
]
;
then
\
(
\
echo
"/*
$$
V */"
;
\
echo
'/*'
;
\
echo
' * NB: This file is machine generated, DO NOT EDIT!'
;
\
echo
' *'
;
\
echo
' * Run make to regenerate'
;
\
echo
' *'
;
\
echo
' */'
;
\
echo
"/*
$$
V */"
;
\
echo
''
;
\
echo
"#define REVISION
\"
$$
V
\"
"
\
)
>
revision.h
;
\
fi
\
else
\
if
[
!
-f
revision.h
]
;
then
\
(
\
echo
"/* NOGIT */"
;
\
echo
'/* No git commit ID available, see include/Makefile.am for explanation */'
;
\
echo
'#define REVISION "NOGIT"'
\
)
>
revision.h
;
\
fi
\
fi
FORCE
:
\ No newline at end of file
src/trackrdrd.c
View file @
afb8eeb7
...
...
@@ -55,6 +55,7 @@
#include "varnishapi.h"
#include "trackrdrd.h"
#include "revision.h"
#define TRACK_TAGS "ReqStart,VCL_log,ReqEnd"
#define TRACKLOG_PREFIX "track "
...
...
@@ -206,7 +207,7 @@ main(int argc, char * const *argv)
P_arg
=
optarg
;
break
;
case
'V'
:
printf
(
PACKAGE_STRING
"
\n
"
);
printf
(
PACKAGE_STRING
"
revision "
REVISION
"
\n
"
);
exit
(
0
);
case
'n'
:
if
(
VSL_Arg
(
vd
,
c
,
optarg
)
<=
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment