Skip to content

Commit ed2f683

Browse files
authored
Fix bug preventing logLevel from being set to disabled (#169)
1 parent a674d0f commit ed2f683

File tree

4 files changed

+36
-3
lines changed

4 files changed

+36
-3
lines changed

amplitude.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2062,7 +2062,9 @@ var logLevels = {
20622062
var logLevel = logLevels.WARN;
20632063

20642064
var setLogLevel = function setLogLevel(logLevelName) {
2065-
logLevel = logLevels[logLevelName] || logLevel;
2065+
if (logLevels.hasOwnProperty(logLevelName)) {
2066+
logLevel = logLevels[logLevelName];
2067+
}
20662068
};
20672069

20682070
var getLogLevel = function getLogLevel() {
@@ -2284,6 +2286,7 @@ var getQueryParam = function getQueryParam(name, query) {
22842286
var utils = {
22852287
setLogLevel: setLogLevel,
22862288
getLogLevel: getLogLevel,
2289+
logLevels: logLevels,
22872290
log: log,
22882291
isEmptyString: isEmptyString,
22892292
getQueryParam: getQueryParam,

amplitude.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/utils.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ var logLevels = {
1111
let logLevel = logLevels.WARN;
1212

1313
const setLogLevel = function setLogLevel(logLevelName) {
14-
logLevel = logLevels[logLevelName] || logLevel;
14+
if (logLevels.hasOwnProperty(logLevelName)) {
15+
logLevel = logLevels[logLevelName];
16+
}
1517
};
1618

1719
const getLogLevel = function getLogLevel() {
@@ -236,6 +238,7 @@ var getQueryParam = function getQueryParam(name, query) {
236238
export default {
237239
setLogLevel,
238240
getLogLevel,
241+
logLevels,
239242
log,
240243
isEmptyString,
241244
getQueryParam,

test/utils.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,33 @@ describe('utils', function() {
1414
});
1515
});
1616

17+
describe('setLogLevel', function() {
18+
afterEach(() => {
19+
utils.setLogLevel('WARN');
20+
});
21+
22+
it('can set log level to DISABLE', function() {
23+
utils.setLogLevel('DISABLE');
24+
assert.strictEqual(utils.getLogLevel(), utils.logLevels.DISABLE);
25+
});
26+
27+
it('can set log level to ERROR', () => {
28+
utils.setLogLevel('ERROR');
29+
assert.strictEqual(utils.getLogLevel(), utils.logLevels.ERROR);
30+
});
31+
32+
it('can set log level to WARN', () => {
33+
utils.setLogLevel('DISABLE');
34+
utils.setLogLevel('WARN');
35+
assert.strictEqual(utils.getLogLevel(), utils.logLevels.WARN);
36+
});
37+
38+
it('can set log level to INFO', () => {
39+
utils.setLogLevel('INFO');
40+
assert.strictEqual(utils.getLogLevel(), utils.logLevels.INFO);
41+
});
42+
});
43+
1744
describe('log', function() {
1845
beforeEach(function() {
1946
utils.setLogLevel('INFO');

0 commit comments

Comments
 (0)