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.

Sign up for GitHub

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

Jump to bottom

Replace YAJL with nlohmann::json #7019

Merged
merged 10 commits into from
Mar 18, 2019
Merged

Replace YAJL with nlohmann::json #7019

merged 10 commits into from
Mar 18, 2019

Conversation

Al2Klimov
Copy link
Member

@Al2Klimov Al2Klimov commented Mar 15, 2019 •
edited
Loading

fixes #6684
fixes #5395
fixes #4703

@Al2Klimov Al2Klimov requested a review from dnsmichi March 15, 2019 10:29
@Al2Klimov
Copy link
Member Author

Substitutes #6812, #6831 and #6809.

@Al2Klimov
Copy link
Member Author

Technically speaking this doesn't have anything to do with #7014, but the new JSON lib doesn't like bad UTF-8... and our own sanitizer is too weak.

@Al2Klimov Al2Klimov mentioned this pull request Mar 15, 2019
Closed
@Al2Klimov
Copy link
Member Author

@dnsmichi Are there any related issues I didn't mention, yet?

@dnsmichi
Copy link
Contributor

Not that I know at the moment. I'll review, merge and review the issue list with @lippserd then.

@dnsmichi dnsmichi added this to the 2.11.0 milestone Mar 18, 2019
@dnsmichi dnsmichi added area/distributed Distributed monitoring (master, satellites, clients) area/api REST API core/quality Improve code, libraries, algorithms, inline docs labels Mar 18, 2019
@dnsmichi dnsmichi mentioned this pull request Mar 18, 2019
Closed
@dnsmichi
Copy link
Contributor

One thing which comes to mind - update to 3.5.0 and use a git subtree with then stripping some dirs.

https://github.com/nlohmann/json/releases/tag/v3.5.0

Fix missing include in JSON tests
76b9cd6 
Non-unity builds require the additional header.
@dnsmichi
Copy link
Contributor

Fixed a missing header include for non-unity builds. Everything else looks fine, especially the tests are very nice, thanks a lot 👍

@dnsmichi dnsmichi merged commit 6ace800 into master Mar 18, 2019
@dnsmichi dnsmichi deleted the feature/new-json-library branch March 18, 2019 16:27
@Al2Klimov Al2Klimov mentioned this pull request Mar 19, 2019
Closed
@dnsmichi dnsmichi mentioned this pull request Apr 10, 2019
Closed
@lippserd lippserd mentioned this pull request Dec 6, 2019
Closed
8 tasks
Al2Klimov added a commit that referenced this pull request Dec 9, 2019
@Al2Klimov
Revert "Merge pull request #7019 from Icinga/feature/new-json-library"
7a17520 
This reverts commit 6ace800, reversing
changes made to 00b8fb1.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dnsmichi dnsmichi dnsmichi approved these changes

Assignees
No one assigned
Labels
area/api REST API area/distributed Distributed monitoring (master, satellites, clients) core/quality Improve code, libraries, algorithms, inline docs
Projects
None yet
Milestone
2.11.0
2 participants
@Al2Klimov @dnsmichi