Fixes #13772 - orchestration now uses app logger

app/models/application_record.rb

@@ -0,0 +1,8 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+
+  # Rails use Notifications for own sql logging so we can override sql logger for orchestration
+  def logger
+    Foreman::Logging.logger('app')
+  end
+end

app/models/architecture.rb

@@ -1,4 +1,4 @@
-class Architecture < ActiveRecord::Base
+class Architecture < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/auth_source.rb

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-class AuthSource < ActiveRecord::Base
+class AuthSource < ApplicationRecord
   include Authorizable
 
   audited

app/models/bookmark.rb

@@ -1,4 +1,4 @@
-class Bookmark < ActiveRecord::Base
+class Bookmark < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/cached_user_role.rb

@@ -1,4 +1,4 @@
-class CachedUserRole < ActiveRecord::Base
+class CachedUserRole < ApplicationRecord
   belongs_to :user
   belongs_to :role
 

app/models/cached_usergroup_member.rb

@@ -1,4 +1,4 @@
-class CachedUsergroupMember < ActiveRecord::Base
+class CachedUsergroupMember < ApplicationRecord
   belongs_to :user
   belongs_to :usergroup
 end

app/models/compute_attribute.rb

@@ -1,4 +1,4 @@
-class ComputeAttribute < ActiveRecord::Base
+class ComputeAttribute < ApplicationRecord
   audited :associated_with => :compute_profile
 
   belongs_to :compute_resource

app/models/compute_profile.rb

@@ -1,4 +1,4 @@
-class ComputeProfile < ActiveRecord::Base
+class ComputeProfile < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/compute_resource.rb

@@ -1,4 +1,4 @@
-class ComputeResource < ActiveRecord::Base
+class ComputeResource < ApplicationRecord
   include Taxonomix
   include Encryptable
   include Authorizable

app/models/config_group.rb

@@ -1,4 +1,4 @@
-class ConfigGroup < ActiveRecord::Base
+class ConfigGroup < ApplicationRecord
   audited
   include Authorizable
   include Parameterizable::ByIdName

app/models/config_group_class.rb

@@ -1,4 +1,4 @@
-class ConfigGroupClass < ActiveRecord::Base
+class ConfigGroupClass < ApplicationRecord
   include Authorizable
 
   audited :associated_with => :config_group

app/models/domain.rb

@@ -1,6 +1,6 @@
 require "resolv"
 # This models a DNS domain and so represents a site.
-class Domain < ActiveRecord::Base
+class Domain < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/environment.rb

@@ -1,4 +1,4 @@
-class Environment < ActiveRecord::Base
+class Environment < ApplicationRecord
   extend FriendlyId
   friendly_id :name, :reserved_words => []
   include Taxonomix

app/models/environment_class.rb

@@ -1,4 +1,4 @@
-class EnvironmentClass < ActiveRecord::Base
+class EnvironmentClass < ApplicationRecord
   belongs_to :environment
   belongs_to :puppetclass
   belongs_to :puppetclass_lookup_key

app/models/external_usergroup.rb

@@ -1,4 +1,4 @@
-class ExternalUsergroup < ActiveRecord::Base
+class ExternalUsergroup < ApplicationRecord
   extend FriendlyId
   friendly_id :name
 

app/models/fact_name.rb

@@ -1,4 +1,4 @@
-class FactName < ActiveRecord::Base
+class FactName < ApplicationRecord
   include Parameterizable::ByIdName
 
   SEPARATOR = '::'

app/models/fact_value.rb

@@ -1,4 +1,4 @@
-class FactValue < ActiveRecord::Base
+class FactValue < ApplicationRecord
   include Authorizable
   include ScopedSearchExtensions
 

app/models/feature.rb

@@ -1,4 +1,4 @@
-class Feature < ActiveRecord::Base
+class Feature < ApplicationRecord
   extend FriendlyId
   friendly_id :name
   has_and_belongs_to_many :smart_proxies

app/models/filter.rb

@@ -1,4 +1,4 @@
-class Filter < ActiveRecord::Base
+class Filter < ApplicationRecord
   include Taxonomix
   include Authorizable
   include TopbarCacheExpiry

app/models/filtering.rb

@@ -1,4 +1,4 @@
-class Filtering < ActiveRecord::Base
+class Filtering < ApplicationRecord
   belongs_to :filter
   belongs_to :permission
 end

app/models/host/base.rb

@@ -1,5 +1,5 @@
 module Host
-  class Base < ActiveRecord::Base
+  class Base < ApplicationRecord
     include Foreman::STI
     include Authorizable
     include Parameterizable::ByName

app/models/host_class.rb

@@ -1,4 +1,4 @@
-class HostClass < ActiveRecord::Base
+class HostClass < ApplicationRecord
   include Authorizable
 
   validates_lengths_from_database

app/models/host_config_group.rb

@@ -1,4 +1,4 @@
-class HostConfigGroup < ActiveRecord::Base
+class HostConfigGroup < ApplicationRecord
   include Authorizable
   audited :associated_with => :host
   audited :associated_with => :hostgroup

app/models/host_facets/base.rb

@@ -1,5 +1,5 @@
 module HostFacets
-  class Base < ActiveRecord::Base
+  class Base < ApplicationRecord
     self.abstract_class = true
 
     include Facets::Base

app/models/host_status/status.rb

@@ -1,5 +1,5 @@
 module HostStatus
-  class Status < ActiveRecord::Base
+  class Status < ApplicationRecord
     include Foreman::STI
 
     self.table_name = 'host_status'

app/models/hostgroup.rb

@@ -1,4 +1,4 @@
-class Hostgroup < ActiveRecord::Base
+class Hostgroup < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :title

app/models/hostgroup_class.rb

@@ -1,4 +1,4 @@
-class HostgroupClass < ActiveRecord::Base
+class HostgroupClass < ApplicationRecord
   include Authorizable
 
   audited :associated_with => :hostgroup

app/models/image.rb

@@ -1,4 +1,4 @@
-class Image < ActiveRecord::Base
+class Image < ApplicationRecord
   include Authorizable
 
   audited :except => [ :password ]

app/models/key_pair.rb

@@ -1,4 +1,4 @@
-class KeyPair < ActiveRecord::Base
+class KeyPair < ApplicationRecord
   belongs_to :compute_resource
   validates_lengths_from_database
   validates :name, :secret, :presence => true

app/models/log.rb

@@ -1,4 +1,4 @@
-class Log < ActiveRecord::Base
+class Log < ApplicationRecord
   belongs_to :message
   belongs_to :source
   belongs_to :report

app/models/lookup_keys/lookup_key.rb

@@ -1,4 +1,4 @@
-class LookupKey < ActiveRecord::Base
+class LookupKey < ApplicationRecord
   include Authorizable
   include HiddenValue
 

app/models/lookup_value.rb

@@ -1,4 +1,4 @@
-class LookupValue < ActiveRecord::Base
+class LookupValue < ApplicationRecord
   include Authorizable
   include PuppetLookupValueExtensions
   include HiddenValue

app/models/mail_notifications/mail_notification.rb

@@ -1,4 +1,4 @@
-class MailNotification < ActiveRecord::Base
+class MailNotification < ApplicationRecord
   include Authorizable
 
   INTERVALS = [N_("Daily"), N_("Weekly"), N_("Monthly")]

app/models/medium.rb

@@ -1,4 +1,4 @@
-class Medium < ActiveRecord::Base
+class Medium < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/message.rb

@@ -1,4 +1,4 @@
-class Message < ActiveRecord::Base
+class Message < ApplicationRecord
   has_many :reports, :through => :logs
   has_many :logs
   validates_lengths_from_database

app/models/model.rb

@@ -1,4 +1,4 @@
-class Model < ActiveRecord::Base
+class Model < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/nic/base.rb

@@ -1,7 +1,7 @@
 # Represents a Host's network interface
 # This class is the both parent
 module Nic
-  class Base < ActiveRecord::Base
+  class Base < ApplicationRecord
     include Foreman::STI
     include Encryptable
     encrypts :password

app/models/notification.rb

@@ -3,7 +3,7 @@
 # Stores the information related to serving the notification to multiple users
 # This class' responsibility is, given a notification blueprint, to determine
 # who are the notification recipients
-class Notification < ActiveRecord::Base
+class Notification < ApplicationRecord
   AUDIENCE_USER     = 'user'
   AUDIENCE_GROUP    = 'usergroup'
   AUDIENCE_TAXONOMY = 'taxonomy'

app/models/notification_blueprint.rb

@@ -6,7 +6,7 @@
 # actions that are notification-worthy. This keeps the responsibilities
 # separate, Notifications taking care of serving the content, and
 # NotificationBlueprint of storing it.
-class NotificationBlueprint < ActiveRecord::Base
+class NotificationBlueprint < ApplicationRecord
   has_many :notifications, :dependent => :destroy
   store :actions, :accessors => [:links], :coder => JSON
 

app/models/notification_recipient.rb

@@ -1,4 +1,4 @@
-class NotificationRecipient < ActiveRecord::Base
+class NotificationRecipient < ApplicationRecord
   belongs_to :notification
   belongs_to :user
   has_one :notification_blueprint, :through => :notification

app/models/operatingsystem.rb

@@ -1,7 +1,7 @@
 require 'ostruct'
 require 'uri'
 
-class Operatingsystem < ActiveRecord::Base
+class Operatingsystem < ApplicationRecord
   include Authorizable
   include ValidateOsFamily
   include PxeLoaderSupport

app/models/os_default_template.rb

@@ -1,4 +1,4 @@
-class OsDefaultTemplate < ActiveRecord::Base
+class OsDefaultTemplate < ApplicationRecord
   belongs_to :provisioning_template
   belongs_to :template_kind
   belongs_to :operatingsystem

app/models/parameter.rb

@@ -1,4 +1,4 @@
-class Parameter < ActiveRecord::Base
+class Parameter < ApplicationRecord
   extend FriendlyId
   friendly_id :name
   include Parameterizable::ByIdName

app/models/permission.rb

@@ -1,4 +1,4 @@
-class Permission < ActiveRecord::Base
+class Permission < ApplicationRecord
   validates_lengths_from_database
   validates :name, :presence => true, :uniqueness => true
 

app/models/puppetclass.rb

@@ -1,4 +1,4 @@
-class Puppetclass < ActiveRecord::Base
+class Puppetclass < ApplicationRecord
   include Authorizable
   include ScopedSearchExtensions
   extend FriendlyId

app/models/realm.rb

@@ -1,4 +1,4 @@
-class Realm < ActiveRecord::Base
+class Realm < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/report.rb

@@ -1,4 +1,4 @@
-class Report < ActiveRecord::Base
+class Report < ApplicationRecord
   LOG_LEVELS = %w[debug info notice warning err alert emerg crit]
 
   include Foreman::STI

app/models/role.rb

@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-class Role < ActiveRecord::Base
+class Role < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/setting.rb

@@ -1,6 +1,6 @@
 require 'resolv'
 
-class Setting < ActiveRecord::Base
+class Setting < ApplicationRecord
   extend FriendlyId
   friendly_id :name
   include ActiveModel::Validations

app/models/smart_proxy.rb

@@ -1,4 +1,4 @@
-class SmartProxy < ActiveRecord::Base
+class SmartProxy < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/source.rb

@@ -1,4 +1,4 @@
-class Source < ActiveRecord::Base
+class Source < ApplicationRecord
   validates_lengths_from_database
   has_many :reports, :through => :logs
   has_many :logs

app/models/ssh_key.rb

@@ -1,4 +1,4 @@
-class SshKey < ActiveRecord::Base
+class SshKey < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

app/models/subnet.rb

@@ -1,6 +1,6 @@
 require 'ipaddr'
 
-class Subnet < ActiveRecord::Base
+class Subnet < ApplicationRecord
   IP_FIELDS = [:network, :mask, :gateway, :dns_primary, :dns_secondary, :from, :to]
   REQUIRED_IP_FIELDS = [:network, :mask]
   SUBNET_TYPES = {:'Subnet::Ipv4' => N_('IPv4'), :'Subnet::Ipv6' => N_('IPv6')}

app/models/subnet_domain.rb

@@ -1,4 +1,4 @@
-class SubnetDomain < ActiveRecord::Base
+class SubnetDomain < ApplicationRecord
   belongs_to :domain
   belongs_to :subnet
 

app/models/taxable_taxonomy.rb

@@ -1,4 +1,4 @@
-class TaxableTaxonomy < ActiveRecord::Base
+class TaxableTaxonomy < ApplicationRecord
   belongs_to :taxonomy
   belongs_to :taxable, :polymorphic => true
 

app/models/taxonomy.rb

@@ -1,4 +1,4 @@
-class Taxonomy < ActiveRecord::Base
+class Taxonomy < ApplicationRecord
   validates_lengths_from_database
 
   include Authorizable

app/models/template.rb

@@ -1,4 +1,4 @@
-class Template < ActiveRecord::Base
+class Template < ApplicationRecord
   include Exportable
   attr_accessor :modify_locked, :modify_default
 

app/models/template_combination.rb

@@ -1,4 +1,4 @@
-class TemplateCombination < ActiveRecord::Base
+class TemplateCombination < ApplicationRecord
   belongs_to :provisioning_template
   belongs_to :environment
   belongs_to :hostgroup

app/models/template_kind.rb

@@ -1,4 +1,4 @@
-class TemplateKind < ActiveRecord::Base
+class TemplateKind < ApplicationRecord
   extend FriendlyId
   friendly_id :name
   validates_lengths_from_database

app/models/token.rb

@@ -1,4 +1,4 @@
-class Token < ActiveRecord::Base
+class Token < ApplicationRecord
   validates_lengths_from_database
   belongs_to_host :foreign_key => :host_id
 

app/models/trend.rb

@@ -1,4 +1,4 @@
-class Trend < ActiveRecord::Base
+class Trend < ApplicationRecord
   validates_lengths_from_database
   after_save :create_values, :if => ->(o) { o.fact_value.nil? }
   after_destroy :destroy_values, :if => ->(o) { o.fact_value.nil? }