Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add logging for json #418

Open
wants to merge 3 commits into
base: v2.x/staging
Choose a base branch
from
Open

Conversation

1000TurquoisePogs
Copy link
Member

JSON logging was hidden behind a DEBUG flag. Instead it is easier to use zowelog in the form of "_zss.json"

Signed-off-by: 1000TurquoisePogs <[email protected]>
@Martin-Zeithaml
Copy link
Contributor

I have added the new logger to the doc update PR3067.

c/json.c Outdated
@@ -210,14 +200,14 @@ void jsonWriteBufferInternal(jsonPrinter *p, char *text, int len) {
loopCount++;
if (newWriteReturn < 0) {
/* TODO: Replace by zowelog(...) */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems this can be deleted.

c/json.c Outdated
@@ -210,14 +200,14 @@ void jsonWriteBufferInternal(jsonPrinter *p, char *text, int len) {
loopCount++;
if (newWriteReturn < 0) {
/* TODO: Replace by zowelog(...) */
JSONERROR("JSON: write error, rc %d, return code %d, reason code %08X\n",
zowelog(NULL, LOG_COMP_JSON, ZOWE_LOG_SEVERE, "JSON: write error, rc %d, return code %d, reason code %08X\n",
newWriteReturn, returnCode, reasonCode);
jsonSetIOErrorFlag(p);
break;
}
if (loopCount > 10) {
/* TODO: Replace by zowelog(...) */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems this can be deleted.

@github-actions github-actions bot added the stale-reopen-if-needed An issue closed due to inactivity. No indication of completion or validity. label Sep 24, 2024
@@ -185,7 +175,7 @@ void jsonWriteBufferInternal(jsonPrinter *p, char *text, int len) {
if (jsonShouldStopWriting(p)) {
return;
}
JSON_DEBUG("write buffer internal: text at %p, len %d\n", text, len);
zowelog(NULL, LOG_COMP_JSON, ZOWE_LOG_DEBUG, "write buffer internal: text at %p, len %d\n", text, len);
DUMPBUF(text, len);
Copy link
Contributor

@ifakhrutdinov ifakhrutdinov Nov 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps, it's worth replacing DUMPBUF with zowedump.

@@ -322,11 +310,11 @@ writeBufferWithEscaping(jsonPrinter *p, size_t len, char text[len]) {

UTF8_GET_NEXT_CHAR(len, text, &i, &utf8Char, &getCharErr);
if (getCharErr != 0) {
JSONERROR("JSON: invalid UTF-8, rc %d\n", getCharErr);
zowelog(NULL, LOG_COMP_JSON, ZOWE_LOG_SEVERE, "JSON: invalid UTF-8, rc %d\n", getCharErr);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if library code should start spitting out messages like this. I think, that in general, it's best to pass info to the caller and the caller would decide if/what to print. Also, we don't know if after these changes, an error in JSON can cause log flooding.

One other thing is, we don't have message IDs for non-debug messages here. It's not a request to change this PR, but we should consider improving the messages here in the future.

@github-actions github-actions bot removed the stale-reopen-if-needed An issue closed due to inactivity. No indication of completion or validity. label Nov 29, 2024
@JoeNemo
Copy link
Contributor

JoeNemo commented Dec 4, 2024

This needs log limiting before it can be committed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants