mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2025-08-10 16:27:06 +02:00
Code Issues Projects Releases Wiki Activity

Make dir app/models/fluentd/setting_archive/

Browse Source 
and move backup_file model under it. prepare for gathering models that concernig about archive
This commit is contained in:
鳥井 雪 2014-12-26 14:59:50 +09:00
parent 8aa29bc176
commit 92134654ea
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/fluentd/settings/histories_controller.rb
View File

@ -5,7 +5,7 @@ class Fluentd::Settings::HistoriesController < ApplicationController
def index def index
@backup_files = @fluentd.agent.backup_files_in_new_order.map do |file_path| @backup_files = @fluentd.agent.backup_files_in_new_order.map do |file_path|
Fluentd::Setting::BackupFile.new(file_path) Fluentd::SettingArchive::BackupFile.new(file_path)
end end
end end
@ -21,6 +21,6 @@ class Fluentd::Settings::HistoriesController < ApplicationController
def find_backup_file def find_backup_file
#Do not use BackupFile.new(params[:id]) because params[:id] can be any path. #Do not use BackupFile.new(params[:id]) because params[:id] can be any path.
@backup_file = Fluentd::Setting::BackupFile.find_by_file_id(@fluentd.agent.config_backup_dir, params[:id]) @backup_file = Fluentd::SettingArchive::BackupFile.find_by_file_id(@fluentd.agent.config_backup_dir, params[:id])
end end
end end

2
app/controllers/fluentd/settings/running_backup_controller.rb
View File

@ -14,6 +14,6 @@ class Fluentd::Settings::RunningBackupController < ApplicationController
private private
def find_backup_file def find_backup_file
@backup_file = Fluentd::Setting::BackupFile.new(@fluentd.agent.running_config_backup_file) @backup_file = Fluentd::SettingArchive::BackupFile.new(@fluentd.agent.running_config_backup_file)
end end
end end

4
app/controllers/fluentd/settings_controller.rb
View File

@ -7,10 +7,10 @@ class Fluentd::SettingsController < ApplicationController
def show def show
@backup_files = @fluentd.agent.backup_files_in_new_order.first(Settings.histories_count_in_preview).map do |file_path| @backup_files = @fluentd.agent.backup_files_in_new_order.first(Settings.histories_count_in_preview).map do |file_path|
Fluentd::Setting::BackupFile.new(file_path) Fluentd::SettingArchive::BackupFile.new(file_path)
end end
@running_backedup_file = Fluentd::Setting::BackupFile.new(@fluentd.agent.running_config_backup_file) @running_backedup_file = Fluentd::SettingArchive::BackupFile.new(@fluentd.agent.running_config_backup_file)
end end
def edit def edit

2
app/models/fluentd/setting/backup_file.rb → app/models/fluentd/setting_archive/backup_file.rb
View File

@ -1,5 +1,5 @@
class Fluentd class Fluentd
module Setting module SettingArchive
class BackupFile class BackupFile
attr_accessor :file_path attr_accessor :file_path

2
spec/features/fluentd/setting/hisotries_spec.rb
View File

@ -26,7 +26,7 @@ describe "histories", stub: :daemon do
end end
describe 'show' do describe 'show' do
let(:last_backup_file) { Fluentd::Setting::BackupFile.new(daemon.agent.backup_files_in_new_order.first) } let(:last_backup_file) { Fluentd::SettingArchive::BackupFile.new(daemon.agent.backup_files_in_new_order.first) }
before do before do
visit "/daemon/setting/histories/#{last_backup_file.file_id}" visit "/daemon/setting/histories/#{last_backup_file.file_id}"