Skip to content

Commit

Permalink
Merge pull request #219 from 1000TurquoisePogs/bugfix/dataservice-log…
Browse files Browse the repository at this point in the history
…ging

Fix messages about dll loading
  • Loading branch information
1000TurquoisePogs authored May 25, 2021
2 parents c9a8299 + 5751dde commit 3706f21
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Zowe Common C Changelog

## `1.22.0`

- Enhancement: Add "remoteStorage" pointer to dataservice struct, for accessing high availability remote storage in addition to or alternatively to local storage.
- Bugfix: Dataservice loading did not warn if program control was missing, which is essential, so plugin loading would fail silently in that case.

## `1.21.0`

- Set cookie path to root in order to avoid multiple cookies when browser tries to set path automatically
Expand Down
3 changes: 2 additions & 1 deletion c/dataservice.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static void *lookupDLLEntryPoint(char *libraryName, char *functionName){
status = fileInfo(libraryName, &info, &returnCode, &reasonCode);
if (status == 0) {
if (!(info.attributeFlags & BPXYSTAT_ATTR_PROGCTL)) {
zowelog(NULL, LOG_COMP_DATASERVICE, ZOWE_LOG_DEBUG,
zowelog(NULL, LOG_COMP_DATASERVICE, ZOWE_LOG_WARNING,
"FAILURE: Dataservice: %s does not have the Program Control attribute this may cause unexpected errors therefore will not be loaded\n",
libraryName);
} else {
Expand All @@ -128,6 +128,7 @@ static void *lookupDLLEntryPoint(char *libraryName, char *functionName){
zowelog(NULL, LOG_COMP_DATASERVICE, ZOWE_LOG_DEBUG, "%s.%s could not be found - dlsym error %s\n", libraryName, functionName, dlerror());
} else {
zowelog(NULL, LOG_COMP_DATASERVICE, ZOWE_LOG_DEBUG, "%s.%s is at 0x%" PRIxPTR "\n", libraryName, functionName, ep);
zowelog(NULL, LOG_COMP_DATASERVICE, ZOWE_LOG_INFO, "Dataservice: %s loaded.\n", libraryName);
}
} else {
zowelog(NULL, LOG_COMP_DATASERVICE, ZOWE_LOG_DEBUG, "dlopen error for %s - %s\n",libraryName, dlerror());
Expand Down

0 comments on commit 3706f21

Please sign in to comment.