fluentd-ui 0.3.14 → 0.3.15

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.14"
+  VERSION = "0.3.15"
 end

data/spec/controllers/fluentd/agents_controller_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Fluentd::AgentsController do
+  let(:log) { double('log').as_null_object }
+
   before do
     allow(controller).to receive(:current_user).and_return true
     allow(controller).to receive(:find_fluentd).and_return(nil)
@@ -32,13 +34,15 @@ describe Fluentd::AgentsController do
 
     it "starts" do
       expect(@agent).to receive(:start).and_return false
-      expect(@agent).to receive(:log_tail).with(1).and_return ["some message"]
+      expect(@agent).to receive(:log).and_return(log)
+      expect(log).to receive(:tail).with(1)
       put :start
     end
 
     it "restarts" do
       expect(@agent).to receive(:restart).and_return false
-      expect(@agent).to receive(:log_tail).with(1).and_return ["some message"]
+      expect(@agent).to receive(:log).and_return(log)
+      expect(log).to receive(:tail).with(1)
       put :restart
     end
   end

data/spec/controllers/misc_controller_spec.rb

@@ -5,7 +5,7 @@ describe MiscController do
 
   class DummyAagent
     def log
-      "dummy_log_content"
+      Struct.new(:read).new(read: "dummy_log_content")
     end
 
     def version
@@ -14,7 +14,7 @@ describe MiscController do
   end
 
   let!(:dummy_agent) { DummyAagent.new }
-  let!(:fluentd_log_content) { dummy_agent.log }
+  let!(:fluentd_log_content) { dummy_agent.log.read }
   let!(:fluentd_version) { dummy_agent.version }
   let(:fluentd_ui_log_content) { <<-LOG.strip_heredoc }
     log1

data/spec/models/fluentd/agent/{local_common_spec.rb → common_spec.rb}

@@ -1,14 +1,14 @@
 require 'spec_helper'
 require 'fileutils'
 
-describe 'Fluentd::Agent::LocalCommon' do
+describe 'Fluentd::Agent::Common' do
   let!(:now) { Time.zone.now }
   before { Timecop.freeze(now) }
   after { Timecop.return }
 
   subject { target_class.new.tap{|t| t.pid_file = pid_file_path} }
 
-  let!(:target_class) { Struct.new(:pid_file){ include Fluentd::Agent::LocalCommon } }
+  let!(:target_class) { Struct.new(:pid_file){ include Fluentd::Agent::Common } }
   let!(:pid_file_path) { Rails.root.join('tmp', 'fluentd-test', 'local_common_test.pid').to_s }
 
   describe '#pid' do

data/spec/models/fluentd_log_spec.rb

@@ -0,0 +1,171 @@
+# coding: utf-8
+require "spec_helper"
+
+describe FluentdLog do
+  describe "#read" do
+    let(:log) { FluentdLog.new(logfile) }
+    let(:logfile) { Rails.root.join("tmp", "dummylog").to_s }
+
+    before { File.open(logfile, "wb"){|f| f.write content } }
+    subject { log.read }
+
+    context "compatible with utf-8" do
+      let(:content) { "utf8あいう\n" }
+      it { subject.should == content }
+    end
+
+    context "incompatible with utf-8" do
+      let(:content) { "eucあいう\n".encode('euc-jp').force_encoding('ascii-8bit') }
+      it { subject.should == content }
+    end
+  end
+
+  describe "#tail" do
+    let(:log) { FluentdLog.new(logfile) }
+    let(:logfile) { Rails.root.join("tmp", "dummylog").to_s }
+
+    before { File.open(logfile, "wb"){|f| f.write content } }
+
+    context "5 lines log" do
+      let(:content) { 5.times.map{|n| "#{n}\n"}.join }
+
+      context "tail(5)" do
+        let(:limit) { 5 }
+        subject { log.tail(limit) }
+
+        it { should == %w(4 3 2 1 0) }
+      end
+
+      context "tail(3)" do
+        let(:limit) { 3 }
+        subject { log.tail(limit) }
+
+        it { should == %w(4 3 2) }
+      end
+
+      context "tail(99)" do
+        let(:limit) { 99 }
+        subject { log.tail(limit) }
+
+        it { should == %w(4 3 2 1 0) }
+      end
+    end
+  end
+
+  describe "#logged_errors" do
+    let(:log) { FluentdLog.new(logfile) }
+
+    describe "#last_error_message" do
+      subject { log.last_error_message }
+
+      context "have 0 error log" do
+        let(:logfile) { File.expand_path("./spec/support/fixtures/error0.log", Rails.root) }
+
+        it { should be_empty }
+      end
+
+      context "have 2 error log" do
+        let(:logfile) { File.expand_path("./spec/support/fixtures/error2.log", Rails.root) }
+
+        it { should == log.recent_errors(1).first[:subject] }
+      end
+    end
+
+    describe "#errors_since" do
+      let(:logged_time) { Time.parse('2014-05-27') }
+      let(:now) { Time.parse('2014-05-29') }
+
+      before { Timecop.freeze(now) }
+      after { Timecop.return }
+
+      subject { log.errors_since(days.days.ago) }
+
+      context "has no errors" do
+        let(:logfile) { File.expand_path("./spec/support/fixtures/error0.log", Rails.root) }
+        let(:days) { 100 }
+
+        it "empty array" do
+          should be_empty
+        end
+      end
+
+      context "has errors" do
+        let(:logfile) { File.expand_path("./spec/support/fixtures/error2.log", Rails.root) }
+
+        context "unreachable since" do
+          let(:days) { 0 }
+          it { should be_empty }
+        end
+
+        context "reachable since" do
+          let(:days) { 100 }
+
+          it "contain stack trace" do
+            subject[0][:subject].should include("Address already in use - bind(2)")
+          end
+
+          it "newer(bottom) is first" do
+            one = Time.parse(subject[0][:subject])
+            two = Time.parse(subject[1][:subject])
+            one.should >= two
+          end
+        end
+      end
+    end
+
+    describe "#recent_errors" do
+      context "have 0 error log" do
+        let(:logfile) { File.expand_path("./spec/support/fixtures/error0.log", Rails.root) }
+        subject { log.recent_errors(2) }
+
+        it "empty array" do
+          should be_empty
+        end
+      end
+
+      context "have 2 error log" do
+        let(:logfile) { File.expand_path("./spec/support/fixtures/error2.log", Rails.root) }
+        subject { log.recent_errors(2) }
+
+        describe "limit" do
+          subject { log.recent_errors(limit).length }
+
+          context "=1" do
+            let(:limit) { 1 }
+            it { should == limit }
+          end
+
+          context "=2" do
+            let(:limit) { 2 }
+            it { should == limit }
+          end
+        end
+
+        it "contain stack trace" do
+          subject[0][:subject].should include("Address already in use - bind(2)")
+        end
+
+        it "newer(bottom) is first" do
+          one = Time.parse(subject[0][:subject])
+          two = Time.parse(subject[1][:subject])
+          one.should >= two
+        end
+      end
+
+      context "have 3 errors log includeing sequential 2 error log" do
+        let(:logfile) { File.expand_path("./spec/support/fixtures/error3.log", Rails.root) }
+        subject { log.recent_errors(3) }
+
+        it "count 3 errors" do
+          subject[0][:subject].should include("3 Address already in use - bind(2)")
+          subject[0][:notes].size.should be 1
+          subject[1][:subject].should include("2 Address already in use - bind(2)")
+          subject[1][:notes].size.should be 2
+          subject[2][:subject].should include("1 Address already in use - bind(2)")
+          subject[2][:notes].size.should be 0
+        end
+      end
+    end
+  end
+
+end

data/spec/support/fluentd_agent_common_behavior.rb

@@ -35,7 +35,7 @@ shared_examples_for "Fluentd::Agent has common behavior" do |klass|
       before { Timecop.freeze(now) }
       after { Timecop.return }
 
-      subject { instance.errors_since(days.days.ago) }
+      subject { instance.log.errors_since(days.days.ago) }
 
       context "has no errors" do
         let(:logfile) { File.expand_path("./spec/support/fixtures/error0.log", Rails.root) }
@@ -73,7 +73,7 @@ shared_examples_for "Fluentd::Agent has common behavior" do |klass|
     describe "#recent_errors" do
       context "have 0 error log" do
         let(:logfile) { File.expand_path("./spec/support/fixtures/error0.log", Rails.root) }
-        subject { instance.recent_errors(2) }
+        subject { instance.log.recent_errors(2) }
 
         it "empty array" do
           should be_empty
@@ -82,10 +82,10 @@ shared_examples_for "Fluentd::Agent has common behavior" do |klass|
 
       context "have 2 error log" do
         let(:logfile) { File.expand_path("./spec/support/fixtures/error2.log", Rails.root) }
-        subject { instance.recent_errors(2) }
+        subject { instance.log.recent_errors(2) }
 
         describe "limit" do
-          subject { instance.recent_errors(limit).length }
+          subject { instance.log.recent_errors(limit).length }
 
           context "=1" do
             let(:limit) { 1 }
@@ -111,7 +111,7 @@ shared_examples_for "Fluentd::Agent has common behavior" do |klass|
 
       context "have 3 errors log includeing sequential 2 error log" do
         let(:logfile) { File.expand_path("./spec/support/fixtures/error3.log", Rails.root) }
-        subject { instance.recent_errors(3) }
+        subject { instance.log.recent_errors(3) }
 
         it "count 3 errors" do
           subject[0][:subject].should include("3 Address already in use - bind(2)")

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.3.14
-  prerelease: 
+  version: 0.3.15
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -10,188 +9,165 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.56
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.56
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.7
 - !ruby/object:Gem::Dependency
   name: sucker_punch
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -199,7 +175,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -207,113 +182,99 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: kramdown-haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Web UI for Fluentd
@@ -325,9 +286,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .bowerrc
-- .gitignore
-- .rspec
+- ".bowerrc"
+- ".gitignore"
+- ".rspec"
 - ChangeLog
 - Gemfile
 - Gemfile.lock
@@ -394,7 +355,7 @@ files:
 - app/models/fluentd/agent/common.rb
 - app/models/fluentd/agent/configuration.rb
 - app/models/fluentd/agent/fluentd_gem.rb
-- app/models/fluentd/agent/local_common.rb
+- app/models/fluentd/agent/process_operation.rb
 - app/models/fluentd/agent/td_agent.rb
 - app/models/fluentd/agent/td_agent/macosx.rb
 - app/models/fluentd/agent/td_agent/unix.rb
@@ -414,6 +375,7 @@ files:
 - app/models/fluentd/setting/out_td.rb
 - app/models/fluentd/setting_archive/backup_file.rb
 - app/models/fluentd/setting_archive/note.rb
+- app/models/fluentd_log.rb
 - app/models/plugin.rb
 - app/models/settings.rb
 - app/models/user.rb
@@ -573,12 +535,13 @@ files:
 - spec/lib/file_reverse_reader_spec.rb
 - spec/lib/fluentd-ui_spec.rb
 - spec/models/fluent_gem_spec.rb
-- spec/models/fluentd/agent/local_common_spec.rb
+- spec/models/fluentd/agent/common_spec.rb
 - spec/models/fluentd/agent_spec.rb
 - spec/models/fluentd/setting/common_spec.rb
 - spec/models/fluentd/setting/in_syslog_spec.rb
 - spec/models/fluentd/setting/out_mongo_spec.rb
 - spec/models/fluentd/setting/out_td_spec.rb
+- spec/models/fluentd_log_spec.rb
 - spec/models/fluentd_spec.rb
 - spec/models/plugin_spec.rb
 - spec/models/user_spec.rb
@@ -713,33 +676,26 @@ files:
 homepage: https://github.com/fluent/fluentd-ui
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3231923267815188099
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3231923267815188099
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Web UI for Fluentd
 test_files:
 - spec/controllers/application_controller_spec.rb
@@ -775,12 +731,13 @@ test_files:
 - spec/lib/file_reverse_reader_spec.rb
 - spec/lib/fluentd-ui_spec.rb
 - spec/models/fluent_gem_spec.rb
-- spec/models/fluentd/agent/local_common_spec.rb
+- spec/models/fluentd/agent/common_spec.rb
 - spec/models/fluentd/agent_spec.rb
 - spec/models/fluentd/setting/common_spec.rb
 - spec/models/fluentd/setting/in_syslog_spec.rb
 - spec/models/fluentd/setting/out_mongo_spec.rb
 - spec/models/fluentd/setting/out_td_spec.rb
+- spec/models/fluentd_log_spec.rb
 - spec/models/fluentd_spec.rb
 - spec/models/plugin_spec.rb
 - spec/models/user_spec.rb