Require dependency otherwise it causes Sidekiq to lock up in development.

This commit is contained in:
Guo Xiang Tan 2017-09-15 13:02:11 +08:00
parent 5be5def217
commit 23b787e0a6
16 changed files with 20 additions and 8 deletions

View File

@ -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

View File

@ -1,3 +1,5 @@
require_dependency 'post_alerter'
module Jobs
class PostAlert < Jobs::Base

View File

@ -1,4 +1,5 @@
require_dependency 'email/sender'
require_dependency 'user_notifications'
module Jobs

View File

@ -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

View File

@ -1,4 +1,5 @@
require_dependency 'enum'
require_dependency 'notification_emailer'
class Notification < ActiveRecord::Base
belongs_to :user

View File

@ -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

View File

@ -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

View File

@ -1,5 +1,6 @@
require 'uri'
require_dependency 'slug'
require_dependency 'discourse'
class TopicLink < ActiveRecord::Base

View File

@ -1,4 +1,6 @@
# This is used in topic lists
require_dependency 'topic_poster'
class TopicPostersSummary
attr_reader :topic, :options

View File

@ -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

View File

@ -1,4 +1,5 @@
require_dependency 'distributed_mutex'
require_dependency 'user_action_creator'
class PostAlerter
def self.post_created(post, opts = {})

View File

@ -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.

View File

@ -1,5 +1,6 @@
---
development:
:concurrency: 5
:queues:
- [critical,4]
- [default, 2]

View File

@ -1,4 +1,5 @@
require 'i18n/backend/pluralization'
require_dependency 'locale_site_setting'
module I18n
module Backend

View File

@ -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'

View File

@ -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