diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a294284..5773a99 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -46,7 +46,7 @@ class ApplicationController < ActionController::Base private def find_fluentd - @fluentd = Fluentd.factory + @fluentd = Fluentd.instance end def set_locale diff --git a/app/controllers/fluentd_controller.rb b/app/controllers/fluentd_controller.rb index 580f3b2..f478b2f 100644 --- a/app/controllers/fluentd_controller.rb +++ b/app/controllers/fluentd_controller.rb @@ -46,7 +46,7 @@ class FluentdController < ApplicationController private def find_fluentd - @fluentd = Fluentd.factory + @fluentd = Fluentd.instance end def fluentd_params diff --git a/app/controllers/tutorials_controller.rb b/app/controllers/tutorials_controller.rb index c80cdbe..8eee849 100644 --- a/app/controllers/tutorials_controller.rb +++ b/app/controllers/tutorials_controller.rb @@ -27,7 +27,7 @@ class TutorialsController < ApplicationController end def find_fluentd - @fluentd = Fluentd.factory + @fluentd = Fluentd.instance end def check_ready diff --git a/app/models/fluentd.rb b/app/models/fluentd.rb index c4e31e2..f319f92 100644 --- a/app/models/fluentd.rb +++ b/app/models/fluentd.rb @@ -123,7 +123,7 @@ class Fluentd # ActiveRecord mimic - def self.factory + def self.instance return unless exists? attr = JSON.parse(File.read(JSON_PATH)) Fluentd.new(attr)