mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2025-08-19 13:31:03 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr198'

Browse Source 
* pr198:
  Remove needless --use-v1-config option
  Update README URLs based on HTTP redirects
This commit is contained in:
uu59 2015-11-30 11:46:16 +09:00
commit e1b0846270
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -4,7 +4,7 @@
[![Gem Version](https://badge.fury.io/rb/fluentd-ui.svg)](http://badge.fury.io/rb/fluentd-ui) [![Gem Version](https://badge.fury.io/rb/fluentd-ui.svg)](http://badge.fury.io/rb/fluentd-ui)
[![Code Climate](https://codeclimate.com/github/fluent/fluentd-ui/badges/gpa.svg)](https://codeclimate.com/github/fluent/fluentd-ui) [![Code Climate](https://codeclimate.com/github/fluent/fluentd-ui/badges/gpa.svg)](https://codeclimate.com/github/fluent/fluentd-ui)
fluentd-ui is a browser-based [fluentd](http://fluentd.org/) and [td-agent](http://docs.treasuredata.com/articles/td-agent) manager that supports following operations. fluentd-ui is a browser-based [fluentd](http://www.fluentd.org) and [td-agent](https://docs.treasuredata.com/articles/td-agent) manager that supports following operations.
* Install, uninstall, and upgrade Fluentd plugins * Install, uninstall, and upgrade Fluentd plugins
* start/stop/restart fluentd process * start/stop/restart fluentd process
@ -28,7 +28,7 @@ And some additional packages (Debian / Ubuntu)
## Development ## Development
$ git clone https://github.com/treasure-data/fluentd-ui $ git clone https://github.com/fluent/fluentd-ui
$ cd fluentd-ui $ cd fluentd-ui
$ bundle install $ bundle install
$ bundle exec rails s $ bundle exec rails s

1
app/models/fluentd/agent/process_operation.rb
View File

@ -50,7 +50,6 @@ class Fluentd
def options_to_argv(opts = {}) def options_to_argv(opts = {})
argv = "" argv = ""
argv << " --use-v1-config"
argv << " -c #{opts[:config_file] || config_file}" argv << " -c #{opts[:config_file] || config_file}"
argv << " -d #{opts[:pid_file] || pid_file}" argv << " -d #{opts[:pid_file] || pid_file}"
argv << " -o #{opts[:log_file] || log_file}" argv << " -o #{opts[:log_file] || log_file}"

1
spec/models/fluentd/agent_spec.rb
View File

@ -18,7 +18,6 @@ describe Fluentd::Agent do
it { should include("-c #{instance.config_file}") } it { should include("-c #{instance.config_file}") }
it { should include("-d #{instance.pid_file}") } it { should include("-d #{instance.pid_file}") }
it { should include("-o #{instance.log_file}") } it { should include("-o #{instance.log_file}") }
it { should include("--use-v1-config") }
end end
describe "#start" do describe "#start" do