Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Add latest commit info reachable through API #371

Merged
merged 2 commits into from
Jan 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions helpers/git.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
'use strict';
var childProcess = require('child_process');

function getLastCommit() {
try {
return childProcess.execSync('git rev-parse HEAD').toString().trim();
}
catch (err) {
return '';
}
}

module.exports = {
getLastCommit: getLastCommit
};
7 changes: 6 additions & 1 deletion modules/peers.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var constants = require('../helpers/constants.js');
var extend = require('extend');
var fs = require('fs');
var ip = require('ip');
var git = require('../helpers/git.js');
var OrderBy = require('../helpers/orderBy.js');
var path = require('path');
var Peer = require('../logic/peer.js');
Expand Down Expand Up @@ -544,7 +545,11 @@ shared.getPeer = function (req, cb) {
};

shared.version = function (req, cb) {
return setImmediate(cb, null, {version: library.config.version, build: library.build});
return setImmediate(cb, null, {
build: library.build,
commit: git.getLastCommit(),
version: library.config.version
});
};

// Export
Expand Down
1 change: 1 addition & 0 deletions test/api/peers.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ describe('GET /api/peers/version', function () {
node.get('/api/peers/version', function (err, res) {
node.expect(res.body).to.have.property('success').to.be.ok;
node.expect(res.body).to.have.property('build').to.be.a('string');
node.expect(res.body).to.have.property('commit').to.be.a('string');
node.expect(res.body).to.have.property('version').to.be.a('string');
done();
});
Expand Down