Skip to content

Commit 1377883

Browse files
committed
fix(errorlog-utils): ensure NAVCloudLogCreate take level as string
1 parent d6cc2e1 commit 1377883

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

ErrorLogUtils/NAVFoundation.CloudLog.axi

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ define_function char NAVCloudLogValidate(char clientId[], char roomName[], char
139139
*/
140140
define_function char NAVCloudLogCreate(char clientId[],
141141
char roomName[],
142-
long level,
142+
char level[],
143143
char message[],
144144
_NAVCloudLog log) {
145145
stack_var _NAVController controller
@@ -161,7 +161,7 @@ define_function char NAVCloudLogCreate(char clientId[],
161161
log.ipAddress = controller.IP.IPAddress
162162

163163
log.roomName = NAVTrimString(roomName)
164-
log.level = NAVGetLogLevel(level)
164+
log.level = NAVTrimString(level)
165165
log.message = message
166166

167167
return true
@@ -195,7 +195,7 @@ define_function char NAVCloudLogCreate(char clientId[],
195195
*/
196196
define_function char[NAV_CLOUDLOG_JSON_BUFFER_SIZE] NAVCloudLogBuild(char clientId[],
197197
char roomName[],
198-
long level,
198+
char level[],
199199
char message[]) {
200200
stack_var _NAVCloudLog log
201201

@@ -239,7 +239,7 @@ define_function char[NAV_CLOUDLOG_JSON_BUFFER_SIZE] NAVCloudLogJsonSerialize(_NA
239239
data = "data, ',"', NAV_CLOUDLOG_FIELD_FIRMWARE_VERSION, '":"', NAVJsonEscapeString(log.firmwareVersion), '"'"
240240
data = "data, ',"', NAV_CLOUDLOG_FIELD_IP_ADDRESS, '":"', log.ipAddress, '"'"
241241
data = "data, ',"', NAV_CLOUDLOG_FIELD_ROOM_NAME, '":"', NAVJsonEscapeString(log.roomName), '"'"
242-
data = "data, ',"', NAV_CLOUDLOG_FIELD_LEVEL, '":"', log.level, '"'"
242+
data = "data, ',"', NAV_CLOUDLOG_FIELD_LEVEL, '":"', lower_string(log.level), '"'"
243243
data = "data, ',"', NAV_CLOUDLOG_FIELD_MESSAGE, '":"', NAVJsonEscapeString(log.message), '"'"
244244
data = "data, '}'"
245245

@@ -264,6 +264,22 @@ define_function char[NAV_CLOUDLOG_JSON_BUFFER_SIZE] NAVCloudLogJsonSerialize(_NA
264264
* // Sends command: "LOG-error,Connection failed"
265265
*/
266266
define_function NAVCloudLog(dev device, long level, char message[]) {
267+
if (!NAVDeviceIsOnline(device)) {
268+
NAVLibraryFunctionErrorLog(NAV_LOG_LEVEL_WARNING,
269+
__NAV_FOUNDATION_CLOUDLOG__,
270+
'NAVCloudLog',
271+
'Device is offline, cannot send log')
272+
return
273+
}
274+
275+
if (!length_array(message)) {
276+
NAVLibraryFunctionErrorLog(NAV_LOG_LEVEL_WARNING,
277+
__NAV_FOUNDATION_CLOUDLOG__,
278+
'NAVCloudLog',
279+
'Message is empty, cannot send log')
280+
return
281+
}
282+
267283
NAVCommand(device, "NAV_CLOUDLOG_COMMAND_PREFIX, '-', NAVGetLogLevel(level), ',', message")
268284
}
269285

0 commit comments

Comments
 (0)