Skip to content
This repository has been archived by the owner on Feb 1, 2018. It is now read-only.

Commit

Permalink
Merge pull request #408 from rhelmer/bug889952-show-crashstats-revisi…
Browse files Browse the repository at this point in the history
…on-on-status-page

fixes bug 8889952 - display git sha for crashstats on /status page
  • Loading branch information
lonnen committed Jul 3, 2013
2 parents 7be5b91 + 598a0e0 commit 6d5c974
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 0 deletions.
2 changes: 2 additions & 0 deletions bin/jenkins.sh
Expand Up @@ -72,4 +72,6 @@ echo "Tar it..."
tar --mode 755 --owner 0 --group 0 --exclude-vcs -zcf ../socorro-crashstats.tar.gz ./*
mv ../socorro-crashstats.tar.gz ./

echo "GIT_SHA = \"`git rev-parse HEAD`\"" > version.py

echo "FIN"
3 changes: 3 additions & 0 deletions crashstats/crashstats/templates/crashstats/status.html
Expand Up @@ -46,6 +46,9 @@ <h2>Server Status</h2>
</div>
<div class="body">
<table class="server_status">
<tr>
<td>Crash-Stats revision</td><td><a href="https://github.com/mozilla/socorro-crashstats/commit/{{ socorro_crashstats_revision }}">{{ socorro_crashstats_revision }}</a></td>
</tr>
<tr>
<td>Socorro revision</td><td><a href="https://github.com/mozilla/socorro/commit/{{ socorro_revision }}">{{ socorro_revision }}</a></td>
</tr>
Expand Down
1 change: 1 addition & 0 deletions crashstats/crashstats/views.py
Expand Up @@ -1146,6 +1146,7 @@ def status(request, default_context=None):
'stat': stats[0],
'plot_data': plot_data,
'socorro_revision': response['socorro_revision'],
'socorro_crashstats_revision': settings.GIT_SHA,
'breakpad_revision': response['breakpad_revision']
})
return render(request, 'crashstats/status.html', context)
Expand Down
2 changes: 2 additions & 0 deletions crashstats/settings/base.py
Expand Up @@ -278,3 +278,5 @@
'interesting-modules',
'interesting-modules-with-versions'
)

from version import *
1 change: 1 addition & 0 deletions version.py
@@ -0,0 +1 @@
GIT_SHA = "CURRENT_SOCORRO_CRASHSTATS_VERSION"

0 comments on commit 6d5c974

Please sign in to comment.