backendless 6.6.4 → 6.6.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,6 +9,8 @@ exports["default"] = void 0;
9
9
 
10
10
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
11
 
12
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
13
+
12
14
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
15
 
14
16
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -28,9 +30,10 @@ var Logging = /*#__PURE__*/function () {
28
30
  key: "reset",
29
31
  value: function reset() {
30
32
  this.loggers = {};
31
- this.pool = [];
33
+ this.messages = [];
32
34
  this.numOfMessages = 10;
33
35
  this.timeFrequency = 1;
36
+ this.messagesLimit = 100;
34
37
  }
35
38
  }, {
36
39
  key: "getLogger",
@@ -51,19 +54,27 @@ var Logging = /*#__PURE__*/function () {
51
54
  var _flush = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
52
55
  var _this = this;
53
56
 
57
+ var messages;
54
58
  return _regenerator["default"].wrap(function _callee$(_context) {
55
59
  while (1) {
56
60
  switch (_context.prev = _context.next) {
57
61
  case 0:
58
- if (!this.flushRequest && this.pool.length) {
62
+ if (!this.flushRequest && this.messages.length) {
59
63
  this.stopFlushInterval();
64
+ messages = (0, _toConsumableArray2["default"])(this.messages);
65
+ this.messages = [];
60
66
  this.flushRequest = this.app.request.put({
61
67
  url: this.app.urls.logging(),
62
- data: this.pool
63
- }).then(function () {
64
- delete _this.flushRequest;
68
+ data: messages
69
+ })["catch"](function (error) {
70
+ _this.messages = [].concat((0, _toConsumableArray2["default"])(messages), (0, _toConsumableArray2["default"])(_this.messages));
71
+
72
+ _this.checkMessagesLimit();
73
+
74
+ throw error;
75
+ })["finally"](function () {
76
+ return delete _this.flushRequest;
65
77
  });
66
- this.pool = [];
67
78
  }
68
79
 
69
80
  return _context.abrupt("return", this.flushRequest);
@@ -89,22 +100,30 @@ var Logging = /*#__PURE__*/function () {
89
100
  throw new Error('"message" must be a string');
90
101
  }
91
102
 
92
- this.pool.push({
103
+ this.messages.push({
93
104
  logger: logger,
94
105
  message: message,
95
106
  exception: exception,
96
107
  'log-level': logLevel,
97
108
  timestamp: Date.now()
98
109
  });
110
+ this.checkMessagesLimit();
99
111
  this.checkMessagesLen();
100
112
  }
101
113
  }, {
102
114
  key: "checkMessagesLen",
103
115
  value: function checkMessagesLen() {
104
- if (this.pool.length >= this.numOfMessages) {
116
+ if (this.messages.length >= this.numOfMessages) {
105
117
  this.startFlushInterval();
106
118
  }
107
119
  }
120
+ }, {
121
+ key: "checkMessagesLimit",
122
+ value: function checkMessagesLimit() {
123
+ if (this.messages.length > this.messagesLimit) {
124
+ this.messages = this.messages.slice(this.messages.length - this.messagesLimit);
125
+ }
126
+ }
108
127
  }, {
109
128
  key: "startFlushInterval",
110
129
  value: function startFlushInterval() {
@@ -131,10 +150,20 @@ var Logging = /*#__PURE__*/function () {
131
150
  this.stopFlushInterval();
132
151
  }
133
152
 
153
+ if (numOfMessages > this.messagesLimit) {
154
+ this.messagesLimit = numOfMessages;
155
+ }
156
+
134
157
  this.numOfMessages = numOfMessages;
135
158
  this.timeFrequency = timeFrequency;
136
159
  this.checkMessagesLen();
137
160
  }
161
+ }, {
162
+ key: "setMessagesLimit",
163
+ value: function setMessagesLimit(messagesLimit) {
164
+ this.messagesLimit = messagesLimit;
165
+ this.checkMessagesLimit();
166
+ }
138
167
  }]);
139
168
  return Logging;
140
169
  }();
@@ -9,6 +9,8 @@ exports["default"] = void 0;
9
9
 
10
10
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
11
 
12
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
13
+
12
14
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
15
 
14
16
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -28,9 +30,10 @@ var Logging = /*#__PURE__*/function () {
28
30
  key: "reset",
29
31
  value: function reset() {
30
32
  this.loggers = {};
31
- this.pool = [];
33
+ this.messages = [];
32
34
  this.numOfMessages = 10;
33
35
  this.timeFrequency = 1;
36
+ this.messagesLimit = 100;
34
37
  }
35
38
  }, {
36
39
  key: "getLogger",
@@ -51,19 +54,27 @@ var Logging = /*#__PURE__*/function () {
51
54
  var _flush = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
52
55
  var _this = this;
53
56
 
57
+ var messages;
54
58
  return _regenerator["default"].wrap(function _callee$(_context) {
55
59
  while (1) {
56
60
  switch (_context.prev = _context.next) {
57
61
  case 0:
58
- if (!this.flushRequest && this.pool.length) {
62
+ if (!this.flushRequest && this.messages.length) {
59
63
  this.stopFlushInterval();
64
+ messages = (0, _toConsumableArray2["default"])(this.messages);
65
+ this.messages = [];
60
66
  this.flushRequest = this.app.request.put({
61
67
  url: this.app.urls.logging(),
62
- data: this.pool
63
- }).then(function () {
64
- delete _this.flushRequest;
68
+ data: messages
69
+ })["catch"](function (error) {
70
+ _this.messages = [].concat((0, _toConsumableArray2["default"])(messages), (0, _toConsumableArray2["default"])(_this.messages));
71
+
72
+ _this.checkMessagesLimit();
73
+
74
+ throw error;
75
+ })["finally"](function () {
76
+ return delete _this.flushRequest;
65
77
  });
66
- this.pool = [];
67
78
  }
68
79
 
69
80
  return _context.abrupt("return", this.flushRequest);
@@ -89,22 +100,30 @@ var Logging = /*#__PURE__*/function () {
89
100
  throw new Error('"message" must be a string');
90
101
  }
91
102
 
92
- this.pool.push({
103
+ this.messages.push({
93
104
  logger: logger,
94
105
  message: message,
95
106
  exception: exception,
96
107
  'log-level': logLevel,
97
108
  timestamp: Date.now()
98
109
  });
110
+ this.checkMessagesLimit();
99
111
  this.checkMessagesLen();
100
112
  }
101
113
  }, {
102
114
  key: "checkMessagesLen",
103
115
  value: function checkMessagesLen() {
104
- if (this.pool.length >= this.numOfMessages) {
116
+ if (this.messages.length >= this.numOfMessages) {
105
117
  this.startFlushInterval();
106
118
  }
107
119
  }
120
+ }, {
121
+ key: "checkMessagesLimit",
122
+ value: function checkMessagesLimit() {
123
+ if (this.messages.length > this.messagesLimit) {
124
+ this.messages = this.messages.slice(this.messages.length - this.messagesLimit);
125
+ }
126
+ }
108
127
  }, {
109
128
  key: "startFlushInterval",
110
129
  value: function startFlushInterval() {
@@ -131,10 +150,20 @@ var Logging = /*#__PURE__*/function () {
131
150
  this.stopFlushInterval();
132
151
  }
133
152
 
153
+ if (numOfMessages > this.messagesLimit) {
154
+ this.messagesLimit = numOfMessages;
155
+ }
156
+
134
157
  this.numOfMessages = numOfMessages;
135
158
  this.timeFrequency = timeFrequency;
136
159
  this.checkMessagesLen();
137
160
  }
161
+ }, {
162
+ key: "setMessagesLimit",
163
+ value: function setMessagesLimit(messagesLimit) {
164
+ this.messagesLimit = messagesLimit;
165
+ this.checkMessagesLimit();
166
+ }
138
167
  }]);
139
168
  return Logging;
140
169
  }();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "backendless",
3
- "version": "6.6.4",
3
+ "version": "6.6.5",
4
4
  "description": "Backendless JavaScript SDK for Node.js and the browser",
5
5
  "browser": "dist/backendless.js",
6
6
  "main": "lib/index.js",
@@ -10,9 +10,10 @@ export default class Logging {
10
10
 
11
11
  reset() {
12
12
  this.loggers = {}
13
- this.pool = []
13
+ this.messages = []
14
14
  this.numOfMessages = 10
15
15
  this.timeFrequency = 1
16
+ this.messagesLimit = 100
16
17
  }
17
18
 
18
19
  getLogger(loggerName) {
@@ -28,19 +29,26 @@ export default class Logging {
28
29
  }
29
30
 
30
31
  async flush() {
31
- if (!this.flushRequest && this.pool.length) {
32
+ if (!this.flushRequest && this.messages.length) {
32
33
  this.stopFlushInterval()
33
34
 
35
+ const messages = [...this.messages]
36
+
37
+ this.messages = []
38
+
34
39
  this.flushRequest = this.app.request
35
40
  .put({
36
41
  url : this.app.urls.logging(),
37
- data: this.pool
38
- })
39
- .then(() => {
40
- delete this.flushRequest
42
+ data: messages
41
43
  })
44
+ .catch(error => {
45
+ this.messages = [...messages, ...this.messages]
46
+
47
+ this.checkMessagesLimit()
42
48
 
43
- this.pool = []
49
+ throw error
50
+ })
51
+ .finally(() => delete this.flushRequest)
44
52
  }
45
53
 
46
54
  return this.flushRequest
@@ -51,17 +59,24 @@ export default class Logging {
51
59
  throw new Error('"message" must be a string')
52
60
  }
53
61
 
54
- this.pool.push({ logger, message, exception, 'log-level': logLevel, timestamp: Date.now() })
62
+ this.messages.push({ logger, message, exception, 'log-level': logLevel, timestamp: Date.now() })
55
63
 
64
+ this.checkMessagesLimit()
56
65
  this.checkMessagesLen()
57
66
  }
58
67
 
59
68
  checkMessagesLen() {
60
- if (this.pool.length >= this.numOfMessages) {
69
+ if (this.messages.length >= this.numOfMessages) {
61
70
  this.startFlushInterval()
62
71
  }
63
72
  }
64
73
 
74
+ checkMessagesLimit() {
75
+ if (this.messages.length > this.messagesLimit) {
76
+ this.messages = this.messages.slice(this.messages.length - this.messagesLimit)
77
+ }
78
+ }
79
+
65
80
  startFlushInterval() {
66
81
  if (!this.flushInterval) {
67
82
  this.flushInterval = setTimeout(() => this.flush(), this.timeFrequency * 1000)
@@ -81,10 +96,20 @@ export default class Logging {
81
96
  this.stopFlushInterval()
82
97
  }
83
98
 
99
+ if (numOfMessages > this.messagesLimit) {
100
+ this.messagesLimit = numOfMessages
101
+ }
102
+
84
103
  this.numOfMessages = numOfMessages
85
104
  this.timeFrequency = timeFrequency
86
105
 
87
106
  this.checkMessagesLen()
88
107
  }
89
108
 
109
+ setMessagesLimit(messagesLimit) {
110
+ this.messagesLimit = messagesLimit
111
+
112
+ this.checkMessagesLimit()
113
+ }
114
+
90
115
  }