Get elasticsearch servers from config

Author: oalders

lib/Catalyst/Plugin/Session/Store/ElasticSearch.pm

@@ -6,12 +6,14 @@ use Moose;
 extends 'Catalyst::Plugin::Session::Store';
 use MooseX::Types::ElasticSearch qw(:all);
 
+use MetaCPAN::Config ();
+
 has _session_es => (
     required => 1,
     is       => 'ro',
     coerce   => 1,
     isa      => ES,
-    default  => sub { shift->_session_plugin_config->{servers} || ':9200' }
+    default  => sub { MetaCPAN::Config::config()->{elasticsearch_servers} },
 );
 has _session_es_index => (
     required => 1,

lib/MetaCPAN/Script/Snapshot.pm

@@ -9,6 +9,7 @@ use DateTime::Format::ISO8601 ();
 use DDP;
 use HTTP::Tiny                ();
 use Log::Contextual           qw( :log );
+use MetaCPAN::Config          ();
 use MetaCPAN::Types::TypeTiny qw( ArrayRef Bool Str );
 use Moose;
 use Sys::Hostname qw( hostname );
@@ -80,9 +81,9 @@ has snap_name => (
 );
 
 has host => (
-    is            => 'ro',
-    isa           => Str,
-    default       => 'http://localhost:9200',
+    is      => 'ro',
+    isa     => Str,
+    default => sub { MetaCPAN::Config::config()->{elasticsearch_servers} },
     documentation => 'ES host, defaults to: http://localhost:9200',
 );
 

lib/MetaCPAN/Server/Model/CPAN.pm

@@ -1,11 +1,10 @@
 package MetaCPAN::Server::Model::CPAN;
 
-use strict;
-use warnings;
-
-use MetaCPAN::Model ();
 use Moose;
 
+use MetaCPAN::Config ();
+use MetaCPAN::Model  ();
+
 extends 'Catalyst::Model';
 
 has esx_model => (
@@ -22,7 +21,9 @@ has index => (
 
 has servers => (
     is      => 'ro',
-    default => ':9200',
+    default => sub {
+        return MetaCPAN::Config::config()->{elasticsearch_servers};
+    },
 );
 
 sub _build_esx_model {

metacpan_server.conf

@@ -1,5 +1,6 @@
 git /usr/bin/git
 
+elasticsearch_servers = :9200
 minion_dsn = postgresql:///minion_queue
 
 <controller User::Turing>

metacpan_server_testing.conf

@@ -1,6 +1,8 @@
 cpan var/t/tmp/fakecpan
 source_base var/t/tmp/source
 
+elasticsearch_servers = http://elasticsearch_test:9200
+
 <model CPAN>
     servers __ENV(ES)__
 </model CPAN>

t/lib/MetaCPAN/Server/Test.pm

@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use HTTP::Request::Common qw(POST GET DELETE);
+use MetaCPAN::Config      ();
 use MetaCPAN::Server      ();
 use Plack::Test;
 use Test::More;
@@ -40,7 +41,12 @@ sub app {
 require MetaCPAN::Model;
 
 sub model {
-    MetaCPAN::Model->new( es => ( $ENV{ES_TEST} ||= 'localhost:9200' ) );
+    MetaCPAN::Model->new(
+        es => (
+            $ENV{ES_TEST}
+                ||= MetaCPAN::Config::config()->{elasticsearch_servers}
+        )
+    );
 }
 
 1;

t/lib/MetaCPAN/TestServer.pm

@@ -2,6 +2,7 @@ package MetaCPAN::TestServer;
 
 use MetaCPAN::Moose;
 
+use MetaCPAN::Config                 ();
 use MetaCPAN::DarkPAN                ();
 use MetaCPAN::Script::Author         ();
 use MetaCPAN::Script::Cover          ();
@@ -82,7 +83,8 @@ sub _build_config {
 sub _build_es_home {
     my $self = shift;
 
-    my $es_home = $ENV{ES_TEST};
+    my $es_home = $ENV{ES_TEST}
+        || MetaCPAN::Config::config()->{elasticsearch_servers};
 
     if ( !$es_home ) {
         my $es_home = $ENV{ES_HOME} or die <<'USAGE';