hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-05 09:31:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sourceVersion a function

Browse source
This commit is contained in:
SachaG 2018-11-27 09:39:51 +09:00
parent 46bdfe0f57
commit 466cb7d0a6
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/vulcan-errors-sentry/lib/server/sentry-server.js
View file

@ -1,4 +1,4 @@
import { getSetting, sourceVersion } from 'meteor/vulcan:core';
import { getSetting, getSourceVersion } from 'meteor/vulcan:core';
import { addInitFunction, addLogFunction, addUserFunction } from 'meteor/vulcan:errors';
import { serverDSNSetting } from '../modules/settings';
import Sentry from '@sentry/node';
@ -17,7 +17,7 @@ function initSentryForServer() {
dsn: serverDSN,
environment,
// see https://github.com/zodern/meteor-up/issues/807#issuecomment-346915622
release: sourceVersion,
release: getSourceVersion(),
});
}
addInitFunction(initSentryForServer);

4
packages/vulcan-lib/lib/server/site.js
View file

@ -1,7 +1,7 @@
import { addGraphQLSchema, addGraphQLResolvers, addGraphQLQuery } from '../modules/graphql.js';
import { Utils } from '../modules/utils';
import { getSetting } from '../modules/settings.js';
import { sourceVersion } from './source_version.js';
import { getSourceVersion } from './source_version.js';
const siteSchema = `type Site {
title: String
@ -18,7 +18,7 @@ const siteResolvers = {
title: getSetting('title'),
url: getSetting('siteUrl', Meteor.absoluteUrl()),
logoUrl: Utils.getLogoUrl(),
sourceVersion,
sourceVersion: getSourceVersion(),
};
},
},

14
packages/vulcan-lib/lib/server/source_version.js
View file

@ -8,4 +8,16 @@ or current child process.
See https://github.com/zodern/meteor-up/issues/807#issuecomment-346915622
*/
export const sourceVersion = process.env.SOURCE_VERSION || childProcess.execSync('git rev-parse HEAD').toString().trim();
export const getSourceVersion = () => {
try {
return (
process.env.SOURCE_VERSION ||
childProcess
.execSync('git rev-parse HEAD')
.toString()
.trim()
);
} catch (error) {
return null;
}
};