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

Read host and port information from solr instance, not Pantheon env variables #411

Closed
wants to merge 10 commits into from
Closed

Read host and port information from solr instance, not Pantheon env variables #411

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
df91f41
#408: Read host and port information from solr instance, not Pantheon…
pavellishin May 30, 2019
11845b2
#408: hm, at least one test (test_wp_query_failed_ping) seems to rely…
pavellishin May 30, 2019
e1d020c
#408: formatting fixes
pavellishin May 30, 2019
917a58f
#408: Adding test
pavellishin May 30, 2019
6b971a4
#408: Whoops, $_ENV not $ENV
pavellishin May 31, 2019
5fb59ca
#408: Check for env
pavellishin May 31, 2019
539d07d
#408: Check for env with array_key_exists (why _doesn't_ it exist?)
pavellishin Jun 3, 2019
51e868b
#408: use getenv
pavellishin Jun 3, 2019
4c7b53e
#408: making variables available in the override function
pavellishin Jun 17, 2019
cffa748
#408: hm, is this empty string evaluating as falsy?
pavellishin Jun 18, 2019
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
12 changes: 10 additions & 2 deletions includes/class-solrpower-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,13 +573,21 @@ function check_for_schema() {
* @return array Array of server connection information.
*/
public function get_server_info() {
if ( ! $this->solr ) {
$host = null;
$port = null;
} else {
$config = $this->solr->getOption( 'endpoint' );
$host = isset( $config['localhost']['host'] ) ? $config['localhost']['host'] : null;
$port = isset( $config['localhost']['port'] ) ? $config['localhost']['port'] : null;
}

$ping = $this->ping_server();

return array(
'ping_status' => $ping,
'ip_address' => getenv( 'PANTHEON_INDEX_HOST' ),
'port' => getenv( 'PANTHEON_INDEX_PORT' ),
'ip_address' => $host,
'port' => $port,
'path' => $this->compute_path(),
);

Expand Down
40 changes: 40 additions & 0 deletions tests/phpunit/test-solrpower-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php

class SolrPowerAPITest extends SolrTestBase {

function setUp() {
parent::setUp();
}

function tearDown() {
parent::tearDown();
}


function test_server_info_uses_actual_config() {
$env_host = array_key_exists('PANTHEON_INDEX_HOST', $_ENV) ? $_ENV['PANTHEON_INDEX_HOST'] : '';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm having some issues with my tests - they don't see PANTHEON_INDEX_HOST set in the env. (You can see my past few commits trying to fiddle around with this.) Shouldn't bootstrap.php be taking care of that?

@pavellishin try using getenv instead of the $_ENV global

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, duh, I thought the previous code accessed it directly :P

$env_port = array_key_exists('PANTHEON_INDEX_PORT', $_ENV) ? $_ENV['PANTHEON_INDEX_PORT'] : '';
$override_host = $env_host . 'OVERRIDE';
$override_port = $env_host . 'OVERRIDE';

$override_connection = function() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pavellishin I don't think $override_host is defined in the context of this function. Maybe pass it in as a parameter?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, dangit. I forget how modern PHP works wrt scoping.

return array(
'endpoint' => array(
'localhost' => array(
'host' => $override_host,
'port' => $override_port,
'path' => '',
)
),
);
};
add_filter( 's4wp_connection_options', $override_connection );

$server_info = SolrPower_Api::get_instance()->get_server_info();

$this->assertEquals( $override_host, $server_info['ip_address'] );
$this->assertEquals( $override_port, $server_info['port'] );

remove_filter( 's4wp_connection_options', $override_connection );
}
}