feat: Support core-keeper for registry and config. #520
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Corey Mutter <[email protected]>
FelixTing
requested changes
Nov 22, 2024
| { | ||
| free(keeper->topic_root); | ||
| } | ||
| if (impl) |
There was a problem hiding this comment.
This check is redundant because keeper is cast from impl and has been checked at the beginning.
| } keeper_impl_t; | ||
|
|
||
| static int32_t edgex_keeper_client_notify(void *impl, const iot_data_t *request, const iot_data_t *pathparams, const iot_data_t *params, iot_data_t **reply); | ||
| #define CONF_PREFIX "edgex/v3/" |
There was a problem hiding this comment.
Suggested change
| #define CONF_PREFIX "edgex/v3/" |
unused macro
Comment on lines
+231
to
+238
| err_msg = "'key' or 'value' member not found in object"; | ||
| } | ||
| } | ||
| else | ||
| { | ||
| err_msg = "An element of 'response' is not a JSON object"; | ||
| } | ||
| } /* End loop over responses */ |
There was a problem hiding this comment.
break the loop when an error occurs
|
|
||
| // iot_log_info(logger, "At key-root alloc, service->name %p", keeper->service->name); | ||
| keeper->key_root = calloc(URL_BUF_SIZE, 1); | ||
| snprintf(keeper->key_root, URL_BUF_SIZE-1, "edgex/v3/%s", keeper->service->name); |
There was a problem hiding this comment.
Suggested change
| snprintf(keeper->key_root, URL_BUF_SIZE-1, "edgex/v3/%s", keeper->service->name); | |
| snprintf(keeper->key_root, URL_BUF_SIZE-1, "edgex/v4/%s", keeper->service->name); |
| { | ||
| t1 = iot_time_msecs (); | ||
| *err = EDGEX_OK; | ||
| ccReady = edgex_keeper_get_tree(impl, "edgex/v3/core-common-config-bootstrapper", err); |
There was a problem hiding this comment.
Suggested change
| ccReady = edgex_keeper_get_tree(impl, "edgex/v3/core-common-config-bootstrapper", err); | |
| ccReady = edgex_keeper_get_tree(impl, "edgex/v4/core-common-config-bootstrapper", err); |
| devsdk_nvpairs_free (ccReady); | ||
| } | ||
|
|
||
| result = edgex_keeper_get_tree(impl, "edgex/v3/core-common-config-bootstrapper/all-services", err); |
There was a problem hiding this comment.
Suggested change
| result = edgex_keeper_get_tree(impl, "edgex/v3/core-common-config-bootstrapper/all-services", err); | |
| result = edgex_keeper_get_tree(impl, "edgex/v4/core-common-config-bootstrapper/all-services", err); |
| result = originalResult; | ||
|
|
||
| devsdk_nvpairs *privateConfig = NULL; | ||
| privateConfig = edgex_keeper_get_tree(impl, "edgex/v3/core-common-config-bootstrapper/device-services", err); |
There was a problem hiding this comment.
Suggested change
| privateConfig = edgex_keeper_get_tree(impl, "edgex/v3/core-common-config-bootstrapper/device-services", err); | |
| privateConfig = edgex_keeper_get_tree(impl, "edgex/v4/core-common-config-bootstrapper/device-services", err); |
| { | ||
| tree[strlen(tree) - 1] = '\0'; | ||
| } | ||
| strcat(tree, "/#"); |
There was a problem hiding this comment.
| } | ||
| strcat(tree, "/#"); | ||
| iot_log_info(keeper->lc, "Subscribing to Keeper notifications on message bus at %s", tree); | ||
| edgex_bus_register_handler(keeper->service->msgbus, tree, impl, edgex_keeper_client_notify); |
There was a problem hiding this comment.
This can only subscribe to edgex/configs/edgex/v4/{service_name}/# topic. It also requires subscribing to edgex/configs/edgex/v4/core-common-config-bootstrapper/all-services/# and edgex/configs/edgex/v4/core-common-config-bootstrapper/device-services/#
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If your build fails due to your commit message not passing the build checks, please review the guidelines here: https://github.com/edgexfoundry/device-sdk-c/blob/main/.github/Contributing.md
PR Checklist
Please check if your PR fulfills the following requirements:
BREAKING CHANGE:describing the break)Testing Instructions
New Dependency Instructions (If applicable)