mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
This reverts commit 7217dcb67a.
https://meta.discourse.org/t/failed-to-bootstrap-due-to-out-of-memory-killer/188141/18?u=osama
Precompiling test_helper.js is so expensive that it can make bootstrap
fail on servers with limited resources (2GB RAM). We will find another
way that doesn't require much resources.
This commit is contained in:
@@ -11,52 +11,16 @@ class QunitController < ApplicationController
|
||||
# only used in test / dev
|
||||
def index
|
||||
raise Discourse::InvalidAccess.new if Rails.env.production?
|
||||
end
|
||||
|
||||
def theme
|
||||
raise Discourse::NotFound.new if !can_see_theme_qunit?
|
||||
|
||||
param_key = nil
|
||||
@suggested_themes = nil
|
||||
if (id = get_param(:id)).present?
|
||||
theme = Theme.find_by(id: id.to_i)
|
||||
param_key = :id
|
||||
elsif (name = get_param(:name)).present?
|
||||
theme = Theme.find_by(name: name)
|
||||
param_key = :name
|
||||
elsif (url = get_param(:url)).present?
|
||||
theme = RemoteTheme.find_by(remote_url: url)&.theme
|
||||
param_key = :url
|
||||
if (theme_name = params[:theme_name]).present?
|
||||
theme = Theme.find_by(name: theme_name)
|
||||
raise Discourse::NotFound if theme.blank?
|
||||
elsif (theme_url = params[:theme_url]).present?
|
||||
theme = RemoteTheme.find_by(remote_url: theme_url)
|
||||
raise Discourse::NotFound if theme.blank?
|
||||
end
|
||||
|
||||
if param_key && theme.blank?
|
||||
return render plain: "Can't find theme with #{param_key} #{params[param_key].inspect}", status: :not_found
|
||||
if theme.present?
|
||||
request.env[:resolved_theme_ids] = [theme.id]
|
||||
request.env[:skip_theme_ids_transformation] = true
|
||||
end
|
||||
|
||||
if !param_key
|
||||
@suggested_themes = Theme
|
||||
.where(
|
||||
id: ThemeField.where(target_id: Theme.targets[:tests_js]).distinct.pluck(:theme_id)
|
||||
)
|
||||
.order(updated_at: :desc)
|
||||
.pluck(:id, :name)
|
||||
return
|
||||
end
|
||||
|
||||
request.env[:resolved_theme_ids] = [theme.id]
|
||||
request.env[:skip_theme_ids_transformation] = true
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def can_see_theme_qunit?
|
||||
return true if !Rails.env.production?
|
||||
current_user&.admin?
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def get_param(key)
|
||||
params[:"theme_#{key}"] || params[key]
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
class ThemeJavascriptsController < ApplicationController
|
||||
DISK_CACHE_PATH = "#{Rails.root}/tmp/javascript-cache"
|
||||
TESTS_DISK_CACHE_PATH = "#{Rails.root}/tmp/javascript-cache/tests"
|
||||
|
||||
skip_before_action(
|
||||
:check_xhr,
|
||||
@@ -12,7 +11,7 @@ class ThemeJavascriptsController < ApplicationController
|
||||
only: [:show, :show_tests]
|
||||
)
|
||||
|
||||
before_action :is_asset_path, :no_cookies, :apply_cdn_headers, only: [:show, :show_tests]
|
||||
before_action :is_asset_path, :no_cookies, :apply_cdn_headers, only: [:show]
|
||||
|
||||
def show
|
||||
raise Discourse::NotFound unless last_modified.present?
|
||||
@@ -36,26 +35,26 @@ class ThemeJavascriptsController < ApplicationController
|
||||
end
|
||||
|
||||
def show_tests
|
||||
digest = params[:digest]
|
||||
raise Discourse::NotFound if !digest.match?(/^\h{40}$/)
|
||||
raise Discourse::NotFound if Rails.env.production?
|
||||
|
||||
theme = Theme.find_by(id: params[:theme_id])
|
||||
raise Discourse::NotFound if theme.blank?
|
||||
theme_id = params.require(:theme_id)
|
||||
theme = Theme.find(theme_id)
|
||||
content = ThemeField
|
||||
.where(
|
||||
theme_id: theme_id,
|
||||
target_id: Theme.targets[:tests_js]
|
||||
)
|
||||
.each(&:ensure_baked!)
|
||||
.map(&:value_baked)
|
||||
.join("\n")
|
||||
|
||||
content, content_digest = theme.baked_js_tests_with_digest
|
||||
raise Discourse::NotFound if content.blank? || content_digest != digest
|
||||
ThemeJavascriptCompiler.force_default_settings(content, theme)
|
||||
|
||||
@cache_file = "#{TESTS_DISK_CACHE_PATH}/#{digest}.js"
|
||||
return render body: nil, status: 304 if not_modified?
|
||||
response.headers["Content-Length"] = content.size.to_s
|
||||
response.headers["Last-Modified"] = Time.zone.now.httpdate
|
||||
immutable_for(1.second)
|
||||
|
||||
if !File.exist?(@cache_file)
|
||||
FileUtils.mkdir_p(TESTS_DISK_CACHE_PATH)
|
||||
File.write(@cache_file, content)
|
||||
end
|
||||
|
||||
response.headers["Content-Length"] = File.size(@cache_file).to_s
|
||||
set_cache_control_headers
|
||||
send_file(@cache_file, disposition: :inline)
|
||||
send_data content, filename: "js-tests-theme-#{theme_id}.js", disposition: :inline
|
||||
end
|
||||
|
||||
private
|
||||
@@ -65,13 +64,7 @@ class ThemeJavascriptsController < ApplicationController
|
||||
end
|
||||
|
||||
def last_modified
|
||||
@last_modified ||= begin
|
||||
if params[:action].to_s == "show_tests"
|
||||
File.exist?(@cache_file) ? File.ctime(@cache_file) : nil
|
||||
else
|
||||
query.pluck_first(:updated_at)
|
||||
end
|
||||
end
|
||||
@last_modified ||= query.pluck_first(:updated_at)
|
||||
end
|
||||
|
||||
def not_modified?
|
||||
|
||||
Reference in New Issue
Block a user