Merge pull request #2127 from samvera/hyrax-5-upgrade-pr-feedback

Hyrax 5 upgrade pr feedback
samvera · Jan 4, 2024 · 1797a6a · 1797a6a
2 parents 0405409 + 762ab77
commit 1797a6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
@@ -12,7 +12,8 @@
   Apartment.configure do |config|
     # Add any models that you do not want to be multi-tenanted, but remain in the global (public) namespace.
     # A typical example would be a Customer or Tenant model that stores each Tenant's information.
-    config.excluded_models = %w[Account AccountCrossSearch DomainName Endpoint User UserStat SolrEndpoint FcrepoEndpoint RedisEndpoint GoodJob::Execution GoodJob::Job GoodJob::Process]
+    config.excluded_models = %w[Account AccountCrossSearch DomainName Endpoint User UserStat SolrEndpoint FcrepoEndpoint RedisEndpoint]
+    config.excluded_models += %w[GoodJob::Execution GoodJob::Job GoodJob::Process] if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'good_job'
 
     # In order to migrate all of your Tenants you need to provide a list of Tenant names to Apartment.
     # You can make this dynamic by providing a Proc object to be called on migrations.

diff --git a/docker-compose.bundle.yml b/docker-compose.bundle.yml