Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235469
Change subject: Fix logic to refresh the service catalog.
......................................................................
Fix logic to refresh the service catalog.
Previously this wouldn't actually work if certain memcache pieces
were improperly aligned.
Possible fix for Bug: T110629
Change-Id: I52422b294d33eee43d82fdd4c630ad4b0442df87
---
M nova/OpenStackNovaController.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/69/235469/1
diff --git a/nova/OpenStackNovaController.php b/nova/OpenStackNovaController.php
index a575a4e..a988318 100644
--- a/nova/OpenStackNovaController.php
+++ b/nova/OpenStackNovaController.php
@@ -746,13 +746,13 @@
return $token;
}
- function getProjectToken( $project ) {
+ function getProjectToken( $project, $forcerefresh=false ) {
global $wgMemc;
// Try to fetch the project token
$projectkey = wfMemcKey( 'openstackmanager',
"fulltoken-$project", $this->username );
$projecttoken = $wgMemc->get( $projectkey );
- if ( is_string( $projecttoken ) ) {
+ if ( is_string( $projecttoken && !$forcerefresh ) ) {
return $projecttoken;
}
$token = $this->getUnscopedToken();
@@ -788,8 +788,8 @@
$catalogJson = $wgMemc->get( $key );
if ( !$catalogJson ) {
# Catalog expired; refresh
- $this->getProjectToken( $this->project );
- $catalogJson = $wgMemc->get( $key );
+ $this->getProjectToken($this->project, true);
+ $catalogJson = $wgMemc->get( $key );
}
$serviceCatalog = json_decode( $catalogJson );
$endpoints = array();
--
To view, visit https://gerrit.wikimedia.org/r/235469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52422b294d33eee43d82fdd4c630ad4b0442df87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
