Skip to content

src: correct json writer the place on process.report - #28433

Closed
himself65 wants to merge 3 commits into
nodejs:masterfrom
himself65:array
Closed

src: correct json writer the place on process.report#28433
himself65 wants to merge 3 commits into
nodejs:masterfrom
himself65:array

Conversation

@himself65

@himself65himself65 commented Jun 26, 2019•
edited
Loading

Copy link
Copy Markdown
Member
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

@nodejs-github-botnodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. report Issues and PRs related to process.report. labels Jun 26, 2019
addaleax
addaleax approved these changes Jun 26, 2019
View reviewed changes

@addaleaxaddaleax left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do you have a test case that we could maybe add?

@gireeshpunathil

gireeshpunathil commented Jun 26, 2019

Copy link
Copy Markdown
Member

Do you have a test case that we could maybe add?

IIUC, there was nothing broken (as there isn't anything after the while loop, in the else block) , this change aligns the code better.

@addaleax

addaleax commented Jun 26, 2019

Copy link
Copy Markdown
Member

@gireeshpunathil If we take the if path, we’d previously have had an json_arrayend without json_arraystart, which seems like a bug to me

@gireeshpunathil

gireeshpunathil commented Jun 26, 2019

Copy link
Copy Markdown
Member

@addaleax - ah, I see! thnx!

@himself65

himself65 commented Jun 26, 2019•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

I add tests to the new commits

on Node v12.4.0

consterror=newError();error.stack='only one line';process.report.writeReport(error);

and the output will like this

},"javascriptStack": {
"message": "only one line"
}
]},"nativeStack": [

@richardlau

richardlau commented Jun 26, 2019

Copy link
Copy Markdown
Member

Test failure is because we end up with two json_objectend() calls (on lines 369 and 387). The one on line 369 can be removed.

richardlau
richardlau reviewed Jun 26, 2019
View reviewed changes
Comment threadtest/report/test-report-writereport.js Outdated
@himself65himself65 changed the title src: fix write json_arraryend at a wrong placesrc: correct json writer the place on process.reportJun 26, 2019
@himself65

himself65 commented Jun 26, 2019

Copy link
Copy Markdown
MemberAuthor

author ready🤔

@himself65himself65 mentioned this pull request Jun 26, 2019
Closed
3 tasks
@richardlaurichardlau added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Jun 26, 2019
@nodejs-github-bot

nodejs-github-bot commented Jun 26, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/24115/

Trott pushed a commit to Trott/io.js that referenced this pull request Jul 6, 2019
@himself65@Trott
src: correct json writer placement in process.report
7fa9abf
PR-URL: nodejs#28433
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Trott pushed a commit to Trott/io.js that referenced this pull request Jul 6, 2019
@himself65@Trott
test: check writeReport when error with one line stack
1c989c9
PR-URL: nodejs#28433
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Trott pushed a commit to Trott/io.js that referenced this pull request Jul 6, 2019
@himself65@Trott
test: check getReport when error with one line stack
c25cccf
PR-URL: nodejs#28433
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@Trott

Trott commented Jul 6, 2019

Copy link
Copy Markdown
Member

Landed in 6aafee1...c25cccf

@TrottTrott closed this Jul 6, 2019
@himself65
himself65 deleted the array branch July 6, 2019 08:55
targos pushed a commit that referenced this pull request Jul 20, 2019
@himself65@targos
src: correct json writer placement in process.report
48c369b
PR-URL: #28433
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
targos pushed a commit that referenced this pull request Jul 20, 2019
@himself65@targos
test: check writeReport when error with one line stack
793163e
PR-URL: #28433
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
targos pushed a commit that referenced this pull request Jul 20, 2019
@himself65@targos
test: check getReport when error with one line stack
5980373
PR-URL: #28433
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This was referenced Jul 23, 2019
Closed
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TrottTrottTrott approved these changes
@addaleaxaddaleaxaddaleax approved these changes
@cjihrigcjihrigcjihrig approved these changes
@richardlaurichardlaurichardlau approved these changes
@gireeshpunathilgireeshpunathilgireeshpunathil approved these changes
@BridgeARBridgeARBridgeAR approved these changes

Assignees

No one assigned

Labels

author readyPRs that have at least one approval, no pending requests for changes, and a CI started.c++Issues and PRs that require attention from people who are familiar with C++.reportIssues and PRs related to process.report.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@himself65@gireeshpunathil@addaleax@richardlau@nodejs-github-bot@Trott@cjihrig@BridgeAR