fluentd-ui 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0331a441430ebf79173a5f487edb2a3c27e39153
-  data.tar.gz: f163ed82b19a95b3855e9b4498bab294464253b6
+  metadata.gz: f8e87a0be85a9ca53be34f2ea4f3fcc17dbbe20a
+  data.tar.gz: a837258d2293575fc3f976bf225db6d9454a9d47
 SHA512:
-  metadata.gz: e220e3a0da1426600ae7ff2a9b17ad69b42da407a1f21ef67f489dfe87ec75a702dc9b3ede54273350f555b71bc716322d54d548edb2c31f493f122b0dce1dfa
-  data.tar.gz: 3d6c95420e6981e516806ee6da6922ead65d08548d554b593a0c50d4ae269d5cd7e5c27d6c607bdab7d0d3132b3c56041930b01e1c82c8583b7f55dce4c5f7c7
+  metadata.gz: 01aa81513fdf9a404674c5208c56711824f3a2dcafb6aa940070b55913d6bab941dc17ad1a38781e832a7efe459ccc2497aff3262d8908061f395241770f5834
+  data.tar.gz: 07c8a506731321b25714cc4c6ac510227f597e7590141080849fae87ca1d82d349c9f1793496f2a74223af614ef02dde1ef434d39e3987f35bb5cf30a078a343

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.3.3 - 2014/11/11
+
+* [fixed] td-agent detection on Mac OS X
+
+
 Release 0.3.2 - 2014/11/10
 
 * [fixed] Auto update fluentd-ui feature

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.2)
+    fluentd-ui (0.3.3)
       addressable
       bundler
       draper (~> 1.3)

data/app/helpers/application_helper.rb

@@ -2,7 +2,7 @@
 
 module ApplicationHelper
   def has_td_agent_system?
-    File.exist?("/etc/init.d/td-agent")
+    File.exist?("/etc/init.d/td-agent") || File.exist?("/opt/td-agent/embedded/bin/fluentd")
   end
 
   def fluentd_ui_logo

data/app/models/fluentd/agent/local_common.rb

@@ -96,6 +96,14 @@ class Fluentd
       ensure
         io && io.close
       end
+
+      def detached_command(cmd)
+        Bundler.with_clean_env do
+          pid = spawn(cmd)
+          Process.detach(pid)
+        end
+        sleep 1 # NOTE/FIXME: too early return will be caused incorrect status report, "sleep 1" is a adhoc hack
+      end
     end
   end
 end

data/app/models/fluentd/agent/td_agent.rb

@@ -12,32 +12,15 @@ class Fluentd
         }
       end
 
-      def start
-        detached_command('/etc/init.d/td-agent start')
-      end
-
-      def stop
-        detached_command('/etc/init.d/td-agent stop')
-      end
-
-      def restart
-        # NOTE: td-agent has no reload command
-        # https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L156
-        detached_command('/etc/init.d/td-agent restart')
-      end
-
       def version
         `/usr/sbin/td-agent --version`.strip
       end
 
-      private
-
-      def detached_command(cmd)
-        Bundler.with_clean_env do
-          pid = spawn(cmd)
-          Process.detach(pid)
-        end
-        sleep 1 # NOTE/FIXME: too early return will be caused incorrect status report, "sleep 1" is a adhoc hack
+      case FluentdUI.platform
+      when :macosx
+        include Macosx
+      when :unix
+        include Unix
       end
     end
   end

data/app/models/fluentd/agent/td_agent/macosx.rb

@@ -0,0 +1,33 @@
+class Fluentd
+  class Agent
+    class TdAgent
+      module Macosx
+
+        def start
+          detached_command("launchctl load #{plist}") && pid_from_launchctl
+        end
+
+        def stop
+          detached_command("launchctl unload #{plist}") && FileUtils.rm(pid_file)
+        end
+
+        def restart
+          stop && start
+        end
+
+        private
+
+        def plist
+          '/Library/LaunchDaemons/td-agent.plist'
+        end
+
+        def pid_from_launchctl
+          # NOTE: launchctl doesn't make pidfile, so detect pid and store it to pidfile manually
+          pid = `launchctl list | grep td-agent | cut -f1`.strip
+          return if pid == ""
+          File.open(pid_file, "w"){|f| f.write pid }
+        end
+      end
+    end
+  end
+end

data/app/models/fluentd/agent/td_agent/unix.rb

@@ -0,0 +1,21 @@
+class Fluentd
+  class Agent
+    class TdAgent
+      module Unix
+        def start
+          detached_command('/etc/init.d/td-agent start')
+        end
+
+        def stop
+          detached_command('/etc/init.d/td-agent stop')
+        end
+
+        def restart
+          # NOTE: td-agent has no reload command
+          # https://github.com/treasure-data/td-agent/blob/master/debian/td-agent.init#L156
+          detached_command('/etc/init.d/td-agent restart')
+        end
+      end
+    end
+  end
+end

data/lib/fluentd-ui.rb

@@ -29,4 +29,13 @@ module FluentdUI
   def self.td_agent_ui?
     ENV["FLUENTD_UI_TD_AGENT"].present?
   end
+
+  def self.platform
+    case RbConfig::CONFIG['host_os']
+    when /darwin|mac os/
+      :macosx
+    else # FIXME: windows is unix? :P
+      :unix
+    end
+  end
 end

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -331,6 +331,8 @@ files:
 - app/models/fluentd/agent/local_common.rb
 - app/models/fluentd/agent/remote.rb
 - app/models/fluentd/agent/td_agent.rb
+- app/models/fluentd/agent/td_agent/macosx.rb
+- app/models/fluentd/agent/td_agent/unix.rb
 - app/models/fluentd/api.rb
 - app/models/fluentd/api/http.rb
 - app/models/fluentd/setting.rb