Skip to content

Commit 57df941

Browse files
ValodyaValodya
committed
- fix logging messages limit
1 parent d772643 commit 57df941

File tree

5 files changed

+74
-24
lines changed

5 files changed

+74
-24
lines changed

‎package-lock.json‎

Lines changed: 14 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
},
9292
"dependencies": {
9393
"@babel/runtime": "^7.21.5",
94-
"backendless-request": "^0.4.3",
94+
"backendless-request": "^0.5.2",
9595
"backendless-rt-client": "0.2.0"
9696
}
9797
}

‎src/logging/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default class Logging {
3535
this.messages = []
3636
this.numOfMessages = 10
3737
this.timeFrequency = 1
38-
this.messagesLimit = 100
38+
this.messagesLimit = 1000
3939
}
4040

4141
loadLoggingLevels() {
@@ -99,7 +99,6 @@ export default class Logging {
9999

100100
this.messages.push({ logger, message, exception, 'log-level': logLevel, timestamp: Date.now() })
101101

102-
this.checkMessagesLimit()
103102
this.checkMessagesLen()
104103
}
105104

‎test/unit/helpers/sandbox.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ const createSandboxFor = each => context => {
144144

145145
beforeHook(() => {
146146
Backendless.serverURL = SERVER_URL
147-
Backendless.initApp(APP_ID, API_KEY)
147+
Backendless.initApp({ appId: APP_ID, apiKey: API_KEY, logging: { loadLevels: false } })
148148
})
149149
}
150150

‎test/unit/specs/logging.js‎

Lines changed: 57 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,37 @@ describe('<Logging>', function() {
4444
expect(logger === logger2).to.equal(true)
4545
})
4646

47+
it('send many sync messages more than limit', async () => {
48+
const req1 = prepareMockRequest()
49+
50+
Backendless.Logging.setMessagesLimit(100)
51+
52+
for (let i = 1; i <= 200; i++) {
53+
logger.debug(`m-${i}`)
54+
}
55+
56+
await Backendless.Logging.flush()
57+
58+
expect(req1.body.map(b => b.message)).to.deep.equal([
59+
'm-1', 'm-2', 'm-3', 'm-4', 'm-5', 'm-6', 'm-7', 'm-8', 'm-9', 'm-10', 'm-11', 'm-12', 'm-13', 'm-14', 'm-15',
60+
'm-16', 'm-17', 'm-18', 'm-19', 'm-20', 'm-21', 'm-22', 'm-23', 'm-24', 'm-25', 'm-26', 'm-27', 'm-28', 'm-29',
61+
'm-30', 'm-31', 'm-32', 'm-33', 'm-34', 'm-35', 'm-36', 'm-37', 'm-38', 'm-39', 'm-40', 'm-41', 'm-42', 'm-43',
62+
'm-44', 'm-45', 'm-46', 'm-47', 'm-48', 'm-49', 'm-50', 'm-51', 'm-52', 'm-53', 'm-54', 'm-55', 'm-56', 'm-57',
63+
'm-58', 'm-59', 'm-60', 'm-61', 'm-62', 'm-63', 'm-64', 'm-65', 'm-66', 'm-67', 'm-68', 'm-69', 'm-70', 'm-71',
64+
'm-72', 'm-73', 'm-74', 'm-75', 'm-76', 'm-77', 'm-78', 'm-79', 'm-80', 'm-81', 'm-82', 'm-83', 'm-84', 'm-85',
65+
'm-86', 'm-87', 'm-88', 'm-89', 'm-90', 'm-91', 'm-92', 'm-93', 'm-94', 'm-95', 'm-96', 'm-97', 'm-98', 'm-99',
66+
'm-100', 'm-101', 'm-102', 'm-103', 'm-104', 'm-105', 'm-106', 'm-107', 'm-108', 'm-109', 'm-110', 'm-111',
67+
'm-112', 'm-113', 'm-114', 'm-115', 'm-116', 'm-117', 'm-118', 'm-119', 'm-120', 'm-121', 'm-122', 'm-123',
68+
'm-124', 'm-125', 'm-126', 'm-127', 'm-128', 'm-129', 'm-130', 'm-131', 'm-132', 'm-133', 'm-134', 'm-135',
69+
'm-136', 'm-137', 'm-138', 'm-139', 'm-140', 'm-141', 'm-142', 'm-143', 'm-144', 'm-145', 'm-146', 'm-147',
70+
'm-148', 'm-149', 'm-150', 'm-151', 'm-152', 'm-153', 'm-154', 'm-155', 'm-156', 'm-157', 'm-158', 'm-159',
71+
'm-160', 'm-161', 'm-162', 'm-163', 'm-164', 'm-165', 'm-166', 'm-167', 'm-168', 'm-169', 'm-170', 'm-171',
72+
'm-172', 'm-173', 'm-174', 'm-175', 'm-176', 'm-177', 'm-178', 'm-179', 'm-180', 'm-181', 'm-182', 'm-183',
73+
'm-184', 'm-185', 'm-186', 'm-187', 'm-188', 'm-189', 'm-190', 'm-191', 'm-192', 'm-193', 'm-194', 'm-195',
74+
'm-196', 'm-197', 'm-198', 'm-199', 'm-200',
75+
])
76+
})
77+
4778
it('send messages pool', async () => {
4879
const req1 = prepareMockRequest()
4980

@@ -287,11 +318,12 @@ describe('<Logging>', function() {
287318
])
288319

289320
expect(req3.body).to.deep.equal([
290-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 2', timestamp: req3.body[0].timestamp },
291-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 3', timestamp: req3.body[1].timestamp },
292-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 4', timestamp: req3.body[2].timestamp },
293-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 5', timestamp: req3.body[3].timestamp },
294-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 6', timestamp: req3.body[4].timestamp },
321+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 1', timestamp: req3.body[0].timestamp },
322+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 2', timestamp: req3.body[1].timestamp },
323+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 3', timestamp: req3.body[2].timestamp },
324+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 4', timestamp: req3.body[3].timestamp },
325+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 5', timestamp: req3.body[4].timestamp },
326+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 6', timestamp: req3.body[5].timestamp },
295327
])
296328
})
297329

@@ -331,19 +363,22 @@ describe('<Logging>', function() {
331363
])
332364

333365
expect(req2.body).to.deep.equal([
334-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 2', timestamp: req2.body[0].timestamp },
335-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 3', timestamp: req2.body[1].timestamp },
336-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 4', timestamp: req2.body[2].timestamp },
337-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 5', timestamp: req2.body[3].timestamp },
338-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 6', timestamp: req2.body[4].timestamp },
366+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 1', timestamp: req2.body[0].timestamp },
367+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 2', timestamp: req2.body[1].timestamp },
368+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 3', timestamp: req2.body[2].timestamp },
369+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 4', timestamp: req2.body[3].timestamp },
370+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 5', timestamp: req2.body[4].timestamp },
371+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 6', timestamp: req2.body[5].timestamp },
339372
])
340373

341374
expect(req3.body).to.deep.equal([
342-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 4', timestamp: req3.body[0].timestamp },
343-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 5', timestamp: req3.body[1].timestamp },
344-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 6', timestamp: req3.body[2].timestamp },
345-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 7', timestamp: req3.body[3].timestamp },
346-
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 8', timestamp: req3.body[4].timestamp },
375+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 2', timestamp: req3.body[0].timestamp },
376+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 3', timestamp: req3.body[1].timestamp },
377+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 4', timestamp: req3.body[2].timestamp },
378+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 5', timestamp: req3.body[3].timestamp },
379+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 6', timestamp: req3.body[4].timestamp },
380+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 7', timestamp: req3.body[5].timestamp },
381+
{ 'log-level': 'DEBUG', 'logger': loggerName, 'message': 'debug message - 8', timestamp: req3.body[6].timestamp },
347382
])
348383
})
349384

@@ -460,7 +495,7 @@ describe('<Logging>', function() {
460495
level: 'FATAL'
461496
},
462497
{
463-
name: 'Global logger',
498+
name : 'Global logger',
464499
level: 'ERROR'
465500
}
466501
])
@@ -494,7 +529,12 @@ describe('<Logging>', function() {
494529

495530
expect(req.body).to.deep.equal([
496531
{ 'log-level': 'FATAL', 'logger': loggerName, 'message': 'fatal message', timestamp: req.body[0].timestamp },
497-
{ 'log-level': 'ERROR', 'logger': 'unregistered', 'message': 'should be flushed', timestamp: req.body[1].timestamp },
532+
{
533+
'log-level': 'ERROR',
534+
'logger' : 'unregistered',
535+
'message' : 'should be flushed',
536+
timestamp : req.body[1].timestamp
537+
},
498538
])
499539
})
500540

0 commit comments

Comments
 (0)