Issue from github: 20 #21
Merged
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
xgin
requested changes
May 18, 2017
plib/library/Slave.php
Outdated
|
|
||
| $view = new Zend_View(); | ||
| $view->setScriptPath(pm_Context::getPlibDir() . 'views/scripts'); | ||
| $slaveConfiguration = $view->partial('index/slave-config.phtml', ['masterIp' => $masterIp, 'secret' => $keySecret]); | ||
| $slaveConfiguration = $view->partial('index/slave-config.phtml', ['masterIp' => $masterIp, 'masterPublicIp' => $masterPublicIp, 'secret' => $keySecret]); |
plib/library/IpAddress.php
Outdated
| self::$_publicIpAddresses = []; | ||
|
|
||
| $request = "<ip><get/></ip>"; | ||
| $response = pm_ApiRpc::getService('1.6.5.0')->call($request); |
There was a problem hiding this comment.
lets avoid copy-paste of api calls. we could have only one static array [ $private => $public ] addresses
|
Could you also reword the commit to be more informative |
|
xgin, I updated fix. Please review. |
xgin
requested changes
May 22, 2017
plib/library/IpAddress.php
Outdated
| public static function getDefault() | ||
| { | ||
| return reset(self::getAvailable()); | ||
| return self::$_defaultIpAddress; |
There was a problem hiding this comment.
Need to warmup cache with self::getAvailable().
And we have to return default IP even if nothing was marked as default in API.
There was a problem hiding this comment.
if (!self::$_defaultIpAddress) {
$ipAddresses = array_keys(self::getAvailable());
}
return self::$_defaultIpAddress ?: reset($ipAddresses);
plib/library/IpAddress.php
Outdated
| self::getAvailable(); | ||
| } | ||
|
|
||
| return self::$_ipAddresses[$ipAddress]; |
There was a problem hiding this comment.
simplify: return self::getAvailable()[$ipAddress] (the method getAvailable is already responsible for the cache)
|
Thank you for advice, I applied your recommendations. |
xgin
approved these changes
May 22, 2017
|
Well done! Let's request for QA assistance & publication. |
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.
Fix for issue #20. This patch set local IP-address for -b (bind) parameter and the extension can work behind the NAT (as an example inside Cloud Environments)