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

Return error when last config file is non existent or has some error #460

Merged
merged 3 commits into from
Aug 8, 2024
Merged

Return error when last config file is non existent or has some error #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b71fee
Return error when last config file is non existent or has some error
Gautham-coder Jun 26, 2024
78e9461
Changelog updated
Gautham-coder Jun 26, 2024
faaedb1
Merge branch 'v2.x/staging' into yaml-non-existent
1000TurquoisePogs Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Bugfix: fix an incorrect check in the recovery router code which might lead to
the state cell-pool being released prematurely (#446)
- Allocating SLH for http server with configurable value 'httpRequestHeapMaxBlocks' in yaml (#447).
- Return error when last config file is non existent or has some error (#460).

## `2.16.0`
- No yaml value converted to null (#442)
Expand Down
3 changes: 3 additions & 0 deletions c/configmgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,9 @@ static int overloadConfiguration(ConfigManager *mgr,
trace(mgr, DEBUG2, "at end of config path\n");
bool dontCare = false;
config->configData = readJson(mgr,config,pathElement,&dontCare);
if ((config->configData == NULL) && !dontCare){
return ZCFG_MISSING_CONFIG_SOURCE;
}
trace(mgr, DEBUG2, "mgr->config = 0x%p\n", config);
return 0; /* success */
} else {
Expand Down
Loading