From e37197bf5cc729c73a4692eeedd03ef1e4ab4840 Mon Sep 17 00:00:00 2001 From: uu59 Date: Mon, 30 Jun 2014 17:45:22 +0900 Subject: [PATCH] Remove dead/duplicated code --- app/controllers/fluentd/agents_controller.rb | 9 --------- app/controllers/fluentd_controller.rb | 4 ---- 2 files changed, 13 deletions(-) diff --git a/app/controllers/fluentd/agents_controller.rb b/app/controllers/fluentd/agents_controller.rb index 0def841..8d3e156 100644 --- a/app/controllers/fluentd/agents_controller.rb +++ b/app/controllers/fluentd/agents_controller.rb @@ -1,11 +1,6 @@ class Fluentd::AgentsController < ApplicationController before_action :find_fluentd - def show - @error_count = 10 - @errors = @fluentd.agent.recent_errors(@error_count) - end - def start unless @fluentd.agent.start flash[:error] = t("error.fluentd_start_failed") + @fluentd.agent.log_tail(1).first @@ -27,10 +22,6 @@ class Fluentd::AgentsController < ApplicationController redirect_to fluentd_path(@fluentd), status: 303 # 303 is change HTTP Verb GET end - def log - render text: @fluentd.agent.log, content_type: "text/plain" - end - def log_tail @logs = @fluentd.agent.log_tail(params[:limit]).reverse if @fluentd render json: @logs diff --git a/app/controllers/fluentd_controller.rb b/app/controllers/fluentd_controller.rb index 068ced6..e19baea 100644 --- a/app/controllers/fluentd_controller.rb +++ b/app/controllers/fluentd_controller.rb @@ -47,10 +47,6 @@ class FluentdController < ApplicationController private - def find_fluentd - @fluentd = Fluentd.instance - end - def fluentd_params params.require(:fluentd).permit(:log_file, :pid_file, :config_file, :variant, :api_endpoint) end