From 23b787e0a6a695ff8b70d095eb6d0ce603f28f15 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Fri, 15 Sep 2017 13:02:11 +0800
Subject: [PATCH] Require dependency otherwise it causes Sidekiq to lock up in
 development.

---
 app/helpers/application_helper.rb         | 2 +-
 app/jobs/regular/post_alert.rb            | 2 ++
 app/jobs/regular/user_email.rb            | 1 +
 app/models/emoji.rb                       | 3 ---
 app/models/notification.rb                | 1 +
 app/models/post.rb                        | 3 +--
 app/models/topic.rb                       | 3 +++
 app/models/topic_link.rb                  | 1 +
 app/models/topic_posters_summary.rb       | 2 ++
 app/models/user.rb                        | 2 ++
 app/services/post_alerter.rb              | 1 +
 config/database.yml                       | 2 +-
 config/sidekiq.yml                        | 1 +
 lib/i18n/backend/discourse_i18n.rb        | 1 +
 lib/pretty_text.rb                        | 1 -
 plugins/discourse-narrative-bot/plugin.rb | 2 ++
 16 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6e23d88e788..803f82e27e4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -7,7 +7,7 @@ require_dependency 'configurable_urls'
 require_dependency 'mobile_detection'
 require_dependency 'category_badge'
 require_dependency 'global_path'
-require_dependency 'canonical_url'
+require_dependency 'emoji'
 
 module ApplicationHelper
   include CurrentUser
diff --git a/app/jobs/regular/post_alert.rb b/app/jobs/regular/post_alert.rb
index cc93aad2855..6fb5fb06164 100644
--- a/app/jobs/regular/post_alert.rb
+++ b/app/jobs/regular/post_alert.rb
@@ -1,3 +1,5 @@
+require_dependency 'post_alerter'
+
 module Jobs
   class PostAlert < Jobs::Base
 
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index f28019b74c6..ce9909da386 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -1,4 +1,5 @@
 require_dependency 'email/sender'
+require_dependency 'user_notifications'
 
 module Jobs
 
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index ba0b4ca11fe..ed4a981dabb 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -9,9 +9,6 @@ class Emoji
   attr_reader :path
   attr_accessor :name, :url
 
-  # whitelist emojis so that new user can post emojis
-  Post::white_listed_image_classes << "emoji"
-
   def initialize(path = nil)
     @path = path
   end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 1096afc0c85..48e3293c5c2 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,4 +1,5 @@
 require_dependency 'enum'
+require_dependency 'notification_emailer'
 
 class Notification < ActiveRecord::Base
   belongs_to :user
diff --git a/app/models/post.rb b/app/models/post.rb
index 9d067962601..d47bf02b456 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1,4 +1,3 @@
-require_dependency 'jobs/base'
 require_dependency 'pretty_text'
 require_dependency 'rate_limiter'
 require_dependency 'post_revisor'
@@ -200,7 +199,7 @@ class Post < ActiveRecord::Base
   end
 
   def self.white_listed_image_classes
-    @white_listed_image_classes ||= ['avatar', 'favicon', 'thumbnail']
+    @white_listed_image_classes ||= ['avatar', 'favicon', 'thumbnail', 'emoji']
   end
 
   def post_analyzer
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 8dcd8d9a5ce..6730091581b 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -8,6 +8,9 @@ require_dependency 'archetype'
 require_dependency 'html_prettify'
 require_dependency 'discourse_tagging'
 require_dependency 'search'
+require_dependency 'list_controller'
+require_dependency 'topic_posters_summary'
+require_dependency 'topic_featured_users'
 
 class Topic < ActiveRecord::Base
   class UserExists < StandardError; end
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 274c78437a0..d66e1616f5f 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -1,5 +1,6 @@
 require 'uri'
 require_dependency 'slug'
+require_dependency 'discourse'
 
 class TopicLink < ActiveRecord::Base
 
diff --git a/app/models/topic_posters_summary.rb b/app/models/topic_posters_summary.rb
index c6cf8255d57..5fa5b2cefcd 100644
--- a/app/models/topic_posters_summary.rb
+++ b/app/models/topic_posters_summary.rb
@@ -1,4 +1,6 @@
 # This is used in topic lists
+require_dependency 'topic_poster'
+
 class TopicPostersSummary
   attr_reader :topic, :options
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 804bee2399f..b13d0e1e407 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,3 +1,4 @@
+require_dependency 'jobs/base'
 require_dependency 'email'
 require_dependency 'email_token'
 require_dependency 'email_validator'
@@ -11,6 +12,7 @@ require_dependency 'url_helper'
 require_dependency 'letter_avatar'
 require_dependency 'promotion'
 require_dependency 'password_validator'
+require_dependency 'notification_serializer'
 
 class User < ActiveRecord::Base
   include Searchable
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index a3c7e7a4540..e911c1b0bb6 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -1,4 +1,5 @@
 require_dependency 'distributed_mutex'
+require_dependency 'user_action_creator'
 
 class PostAlerter
   def self.post_created(post, opts = {})
diff --git a/config/database.yml b/config/database.yml
index c1575122620..cd064896b66 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -3,7 +3,7 @@ development:
   adapter: postgresql
   database: <%= ENV['DISCOURSE_DEV_DB'] || 'discourse_development' %>
   min_messages: warning
-  pool: 5
+  pool: 10
   timeout: 5000
   host_names:
     ### Don't include the port number here. Change the "port" site setting instead, at /admin/site_settings.
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 7b095d7d42a..3f94e6a21b8 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -1,5 +1,6 @@
 ---
 development:
+  :concurrency: 5
   :queues:
     - [critical,4]
     - [default, 2]
diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index 65a090cd261..375b72b8cc2 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -1,4 +1,5 @@
 require 'i18n/backend/pluralization'
+require_dependency 'locale_site_setting'
 
 module I18n
   module Backend
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 56a8da4352e..1772f3287de 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -3,7 +3,6 @@ require 'nokogiri'
 require 'erb'
 require_dependency 'url_helper'
 require_dependency 'excerpt_parser'
-require_dependency 'post'
 require_dependency 'discourse_tagging'
 require_dependency 'pretty_text/helpers'
 
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 27b67194872..497bbb85ff7 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -44,6 +44,8 @@ after_initialize do
   # Disable welcome message because that is what the bot is supposed to replace.
   SiteSetting.send_welcome_message = false
 
+  require_dependency 'plugin_store'
+
   module ::DiscourseNarrativeBot
     PLUGIN_NAME = "discourse-narrative-bot".freeze