yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-04 03:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update is truthy fn

Browse Source 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
This commit is contained in:
Alexandre Bodin 2020-03-30 13:55:28 +02:00
parent 24000818f4
commit d60578c875
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi/lib/services/metrics/__tests__/truthy-var.test.js → packages/strapi/lib/services/metrics/__tests__/is-truthy.js
View File

@ -1,4 +1,4 @@
const isTruthyEnvVar = require('../truthy-var'); const isTruthyEnvVar = require('../is-truthy');
describe('isTruthyEnvVar', () => { describe('isTruthyEnvVar', () => {
test('Handles boolean strings', () => { test('Handles boolean strings', () => {

4
packages/strapi/lib/services/metrics/index.js
View File

@ -12,13 +12,13 @@ const ciEnv = require('ci-info');
const { scheduleJob } = require('node-schedule'); const { scheduleJob } = require('node-schedule');
const createMiddleware = require('./middleware'); const createMiddleware = require('./middleware');
const isTruthyEnvVar = require('./truthy-var'); const isTruthy = require('./is-truthy');
const createTelemetryInstance = strapi => { const createTelemetryInstance = strapi => {
const uuid = strapi.config.uuid; const uuid = strapi.config.uuid;
const deviceId = machineIdSync(); const deviceId = machineIdSync();
const isDisabled = !uuid || isTruthyEnvVar(process.env.STRAPI_TELEMETRY_DISABLED); const isDisabled = !uuid || isTruthy(process.env.STRAPI_TELEMETRY_DISABLED);
const anonymous_metadata = { const anonymous_metadata = {
environment: strapi.config.environment, environment: strapi.config.environment,

9
packages/strapi/lib/services/metrics/is-truthy.js Normal file
View File

@ -0,0 +1,9 @@
'use strict';
const _ = require('lodash');
const isTruthy = val => {
return [1, true].includes(val) || ['true', '1'].includes(_.toLower(val));
};
module.exports = isTruthy;

16
packages/strapi/lib/services/metrics/truthy-var.js
View File

@ -1,16 +0,0 @@
'use strict';
const isTruthyEnvVar = val => {
if (val === null || val === undefined) return false;
if (val === true) return true;
if (val.toString().toLowerCase() === 'true') return true;
if (val.toString().toLowerCase() === 'false') return false;
if (val === 1) return true;
return false;
};
module.exports = isTruthyEnvVar;