diff options
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Elastic/Role/HasClient.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Template.pm | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Bugzilla/Elastic/Role/HasClient.pm b/Bugzilla/Elastic/Role/HasClient.pm index 8e2687880..a971392e0 100644 --- a/Bugzilla/Elastic/Role/HasClient.pm +++ b/Bugzilla/Elastic/Role/HasClient.pm @@ -8,7 +8,6 @@ package Bugzilla::Elastic::Role::HasClient; use 5.10.1; use Moo::Role; -use Search::Elasticsearch; has 'client' => (is => 'lazy'); @@ -16,6 +15,7 @@ has 'client' => (is => 'lazy'); sub _build_client { my ($self) = @_; + require Search::Elasticsearch; return Search::Elasticsearch->new( nodes => [ split(/\s+/, Bugzilla->params->{elasticsearch_nodes}) ], cxn_pool => 'Sniff', diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index e54877e9b..d4a5b15dc 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -1042,11 +1042,7 @@ sub create { # under mod_perl, use a provider (template loader) that preloads all templates into memory my $provider_class -<<<<<<< HEAD - = BZ_PERSISTENT -======= = $opts{preload} ->>>>>>> dylanwh/mojo-poc ? 'Bugzilla::Template::PreloadProvider' : 'Template::Provider'; |