skylight 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28dd7214b4627640a19b45a6e5fc331fbfacf27c
-  data.tar.gz: 024db5832f07bc150605be92ab4e08dd564d5e17
+  metadata.gz: 9d299c38749f9eb46bf2ed780d3b554760d8728b
+  data.tar.gz: 74e57f72bc4bc58ab4a8977382d930e032414ca4
 SHA512:
-  metadata.gz: e061ebe3cb082688bf4b1986aa48bd6cb9ed3810097f1eced4f0c96c589d53eb3072c394fa163c5d792ce8c271efb9202931f02b68f325c8d36d19ce4f2e283e
-  data.tar.gz: 51def9a798e16514df5de9eecb62ad70ed78d00770837ef73c81805a5b6b6d948c707cecd6011515eb9b6f8fa3d61b7a052394b8134938515315478a445c9ebf
+  metadata.gz: b4d63a7ac26843af364e798327841652ee2a9fc21b0724845190f0a7e963886ab534fc16a813ab673dab32f37cc59835c7f459255881594542c6827d7eeac190
+  data.tar.gz: 70b05635d94f0b60ede936c2b645c978497fcb85fb8acc061290124b595bff1849367b9977bc618513cd26e985700723355dc38b569468a4ad8afd532ded0456

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.1 (November 15, 2016)
+
+* [BUGFIX] Gracefully handle non-writable log files
+* [BUGFIX] Fix skylight doctor's handling of config files
+* [BUGFIX] Support MetalControllers that don't use ActionController::Rendering
+
 ## 1.0.0 (October 19, 2016)
 
 * [BETA FEATURE] Track separate segments for endpoints. Contact support@skylight.io to have this feature enabled for your account.

data/ext/libskylight.yml

@@ -1,6 +1,6 @@
 ---
-version: "1.0.0-4a74d28"
+version: "1.0.1-fcb0e55"
 checksums:
-  x86-linux:     "66e1b9fd8c9223febf8e7febb56a2ad71714ab61193d153e2bf0f462409cb4f7"
-  x86_64-linux:  "40d7e0822610244d916df5488a83af5bdc7b2aa8b2410abc672a42cfab629f3f"
-  x86_64-darwin: "1484612b150317f1debdcaeab9bea806749d8be9ac132b8cd1b92781d1972b46"
+  x86-linux:     "8a4b585dc72735947bc3bd7ae24c11e92dbe8d57af4afb7345df561fad563804"
+  x86_64-linux:  "7c192d9c98715f32be74c20596738e48af295629a401dffe5aff21da796231ed"
+  x86_64-darwin: "8bd31a89a7bdb32c0903608c5e73818af9dfb0f8b3f3004ec2fa8f587ee5f819"

data/lib/skylight/cli/doctor.rb

@@ -14,7 +14,7 @@ module Skylight
 
             # Normally auto-loaded, but we haven't loaded Rails by the time Skylight is loaded
             require 'skylight/railtie'
-            require File.expand_path('config/application', Dir.pwd)
+            require rails_rb
           else
             say "No Rails application detected", :red
             abort "Currently `skylight doctor` only works with Rails applications"
@@ -54,10 +54,6 @@ module Skylight
       def check_config
         say "Checking for valid configuration"
 
-        # MEGAHAX
-        railtie = Skylight::Railtie.send(:new)
-        config = railtie.send(:load_skylight_config, Rails.application)
-
         indent do
           begin
             config.validate!
@@ -127,6 +123,17 @@ module Skylight
       def status
         say "All checks passed!", :green
       end
+
+      private
+
+        # Overwrite the default helper method to load from Rails
+        def config
+          return @config if @config
+
+          # MEGAHAX
+          railtie = Skylight::Railtie.send(:new)
+          @config = railtie.send(:load_skylight_config, Rails.application)
+        end
     end
   end
 end

data/lib/skylight/config.rb

@@ -296,10 +296,15 @@ module Skylight
       # TODO: Move this out of the validate! method: https://github.com/tildeio/direwolf-agent/issues/273
       # FIXME: Why not set the sockdir_path and pidfile_path explicitly?
       # That way we don't have to keep this in sync with the Rust repo.
-      sockdir_path = self[:'daemon.sockdir_path'] || File.expand_path('.')
-      pidfile_path = self[:'daemon.pidfile_path'] || File.expand_path('skylight.pid', sockdir_path)
+      sockdir_path = File.expand_path(self[:'daemon.sockdir_path'] || '.', root)
+      pidfile_path = File.expand_path(self[:'daemon.pidfile_path'] || 'skylight.pid', sockdir_path)
+      log_file = self[:log_file]
+      alert_log_file = self[:alert_log_file]
 
-      check_permissions(pidfile_path, sockdir_path)
+      check_file_permissions(pidfile_path, "daemon.pidfile_path or daemon.sockdir_path")
+      check_sockdir_permissions(sockdir_path)
+      check_logfile_permissions(log_file, "log_file")
+      check_logfile_permissions(alert_log_file, "alert_log_file")
 
       true
     end
@@ -348,31 +353,40 @@ module Skylight
       return true
     end
 
-    def check_permissions(pidfile, sockdir_path)
-      pidfile_root = File.dirname(pidfile)
+    def check_file_permissions(file, key)
+      file_root = File.dirname(file)
 
-      FileUtils.mkdir_p pidfile_root
-      FileUtils.mkdir_p sockdir_path
+      # Try to make the directory, don't blow up if we can't. Our writable? check will fail later.
+      FileUtils.mkdir_p file_root rescue nil
 
-      if File.exist?(pidfile)
-        unless FileTest.writable?(pidfile)
-          raise ConfigError, "File `#{pidfile}` not writable. Please set daemon.pidfile_path or daemon.sockdir_path in your config to a writable path"
-        end
-      else
-        unless FileTest.writable?(pidfile_root)
-          raise ConfigError, "Directory `#{pidfile_root}` not writable. Please set daemon.pidfile_path or daemon.sockdir_path in your config to a writable path"
-        end
+      if File.exist?(file) && !FileTest.writable?(file)
+        raise ConfigError, "File `#{file}` is not writable. Please set #{key} in your config to a writable path"
+      end
+
+      unless FileTest.writable?(file_root)
+        raise ConfigError, "Directory `#{file_root}` is not writable. Please set #{key} in your config to a writable path"
       end
+    end
+
+    def check_sockdir_permissions(sockdir_path)
+      # Try to make the directory, don't blow up if we can't. Our writable? check will fail later.
+      FileUtils.mkdir_p sockdir_path rescue nil
 
       unless FileTest.writable?(sockdir_path)
-        raise ConfigError, "Directory `#{sockdir_path}` not writable. Please set daemon.sockdir_path in your config to a writable path"
+        raise ConfigError, "Directory `#{sockdir_path}` is not writable. Please set daemon.sockdir_path in your config to a writable path"
       end
 
-      if check_nfs(pidfile)
+      if check_nfs(sockdir_path)
         raise ConfigError, "Directory `#{sockdir_path}` is an NFS mount and will not allow sockets. Please set daemon.sockdir_path in your config to a non-NFS path."
       end
     end
 
+    def check_logfile_permissions(log_file, key)
+      return if log_file == '-' # STDOUT
+      log_file = File.expand_path(log_file, root)
+      check_file_permissions(log_file, key)
+    end
+
     def key?(key)
       key = Config.remap_key(key)
       @priority.key?(key) || @values.key?(key)
@@ -556,26 +570,17 @@ authentication: #{self[:authentication]}
     end
 
     def alert_logger
-      @alert_logger ||=
-        begin
-          MUTEX.synchronize do
-            unless l = @alert_logger
-              out = get(:alert_log_file)
-
-              if out == '-'
-                out = Util::AlertLogger.new(load_logger)
-              elsif !(IO === out)
-                out = File.expand_path(out, root)
-                FileUtils.mkdir_p(File.dirname(out))
-              end
-
-              l = Logger.new(out)
-              l.level = Logger::DEBUG
-            end
+      @alert_logger ||= MUTEX.synchronize do
+        unless l = @alert_logger
+          out = get(:alert_log_file)
+          out = Util::AlertLogger.new(load_logger) if out == '-'
 
-            l
-          end
+          l = create_logger(out)
+          l.level = Logger::DEBUG
         end
+
+        l
+      end
     end
 
     def alert_logger=(logger)
@@ -601,17 +606,24 @@ authentication: #{self[:authentication]}
       `stat -f -L -c %T #{path} 2>&1`.strip == 'nfs'
     end
 
+    def create_logger(out)
+      if out.is_a?(String)
+        out = File.expand_path(out, root)
+        # May be redundant since we also do this in the permissions check
+        FileUtils.mkdir_p(File.dirname(out))
+      end
+
+      Logger.new(out)
+    rescue
+      Logger.new(STDOUT)
+    end
+
     def load_logger
       unless l = @logger
         out = get(:log_file)
         out = STDOUT if out == '-'
 
-        unless IO === out
-          out = File.expand_path(out, root)
-          FileUtils.mkdir_p(File.dirname(out))
-        end
-
-        l = Logger.new(out)
+        l = create_logger(out)
         l.level =
           case get(:log_level)
           when /^debug$/i then Logger::DEBUG

data/lib/skylight/probes/action_controller.rb

@@ -10,7 +10,7 @@ module Skylight
               append_info_to_payload_without_sk(payload)
               if respond_to?(:rendered_format)
                 rendered_mime = rendered_format
-              else
+              elsif respond_to?(:lookup_context)
                 format = lookup_context.formats.first
                 rendered_mime = Mime[format.to_sym] if format
               end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport