inline init() to avoid cstore startup race condition

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search.pm
index f025bb7..b1d34d9 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search.pm
@@ -37,7 +37,6 @@ sub initialize {
 sub child_init {
     OpenILS::Application::Search::Z3950->child_init;
     OpenILS::Application::Search::Browse->child_init;
-    OpenILS::Application::Search::Elastic->child_init;
 }
     
 

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Elastic.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Elastic.pm
index 178b3d8..0a16511 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Elastic.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Elastic.pm
@@ -36,11 +36,16 @@ my $bib_fields;
 my $hidden_copy_statuses;
 my $hidden_copy_locations;
 my $avail_copy_statuses;
-our $enabled = {};
 
-sub child_init {
+# NOTE calling cstore functions in child_init is dicey because child_init
+# may be run before cstore is ready for requests.  Use a local init() instead.
+my $init_done = 0;
+sub init {
     my $class = shift;
 
+    return if $init_done;
+    $init_done = 1;
+
     my $e = new_editor();
 
     $bib_fields = $e->retrieve_all_elastic_bib_field;
@@ -158,6 +163,8 @@ sub bib_search {
     my ($self, $client, $query, $options) = @_;
     $options ||= {};
 
+    init();
+
     my $staff = ($self->api_name =~ /staff/);
 
     return {count => 0, ids => []} unless $query && $query->{query};