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

do not invoke callback two times when error about trust not found in trustConf #789

Merged
merged 7 commits into from
Jul 17, 2024
Merged

do not invoke callback two times when error about trust not found in trustConf #789

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
84d7b55
do not invoke callback two times when error retrieving token
AlvaroVega Jul 16, 2024
a3c3134
thow error if not trust is found
AlvaroVega Jul 16, 2024
7123a25
update CNR
AlvaroVega Jul 16, 2024
91ee4ff
do not print trustConf file in error log
AlvaroVega Jul 17, 2024
f23178a
Update CHANGES_NEXT_RELEASE
AlvaroVega Jul 17, 2024
f1d9018
Update CHANGES_NEXT_RELEASE
fgalan Jul 17, 2024
efbc2d5
Update CHANGES_NEXT_RELEASE
AlvaroVega Jul 17, 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 CHANGES_NEXT_RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix: do not invoke calback twice when error about trust not found in trustConf (#750)
4 changes: 2 additions & 2 deletions lib/models/keystone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ function getToken(trust, callback) {

// check trust was found or log it
if (!trustConf) {
logger.error('Trust %s not found in configTrust file with content %s', trust, configTrust);
callback(new errors.TokenRetrievalError(trust, 'trust not found' + trust));
logger.error('Trust %s not found in configTrust file', trust);
throw errors.TokenRetrievalError(trust, 'trust not found' + trust);
}
var options = {
url: 'http://' + trustConf.host + ':' + trustConf.port + '/v3/auth/tokens',
Expand Down
2 changes: 1 addition & 1 deletion lib/models/updateAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ function makeTokenListenerFunc(action, event, version, callback) {
if (error || !token) {
return callback(error);
} else {
logger.debug('tokenHandlerFunc retrying with', token);
logger.debug('tokenHandlerFunc retrying with %s', token);
return doRequestV2(action, event, token, function cbDoReqUpdAxn(error, data) {
callback(error, data);
});
Expand Down
Loading