task_status.rb in katello-2.4.0.rc1

- old
+ new

@@ -1,17 +1,5 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   class TaskStatus < Katello::Model
     self.include_root_in_json = false
 
     include Util::TaskStatus
@@ -26,10 +14,10 @@
       FINISHED = :finished
       CANCELED = :canceled
       TIMED_OUT = :timed_out
     end
 
-    include Glue::ElasticSearch::TaskStatus if Katello.config.use_elasticsearch
+    include Glue::ElasticSearch::TaskStatus if SETTINGS[:katello][:use_elasticsearch]
 
     belongs_to :organization, :inverse_of => :task_statuses, :class_name => "Organization"
     belongs_to :user, :inverse_of => :task_statuses, :class_name => "::User"
 
     belongs_to :task_owner, :polymorphic => true