skylight 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f41a143e4cf033132f7bc8eb4dc0b9a11c362b90
-  data.tar.gz: 8aa8c73c68d6e05289efed9773f38f8b9e63befd
+  metadata.gz: 766b35710e2c5cc91f17df574ceb6ae2d99c476a
+  data.tar.gz: 9145a148d2b08e8d4c74e283d57cb922664d72b2
 SHA512:
-  metadata.gz: 1f54a122a8affaf55194c093792eadaa34d02cc5b850c5297845f80fdae9645581413463b159852cbaacdd88fc38d6da75a5d4f881f7266d44131d4e430d0a7d
-  data.tar.gz: 5d42410b700fd20f4dc17c9b728ce37b2635df0482794f7eb6b3f6cc76c205429df32e3225608e28d56eb80d7320ba5a3016815312ef89d7afacf7d1127ab2d3
+  metadata.gz: 29c0ae3e1fea0b3e180fdbf6a1db5e9818783f4ea46241101afa0e8d601c9dee6100f7432e89b03f0c6318f981227f160da197f2a17108683919301f95a295c0
+  data.tar.gz: fb823dc8938a5db2292a9ab10aedb2269f00bb180605a55dee8844d12dfbda4f7b722e5b79f1e8d53e34eca641875433efd669f03eb5a6b4bf95749ccd6ac49d

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.4.1 (November 7, 2014)
+
+* [BUGFIX] Fix downloading native agent on 32bit systems
+* [BUGFIX] Support legacy config settings
+* [FEATURE] Check FS permissions on instrumenter start
+
+## 0.4.0 (November 3, 2014)
+
+* Featherweight Agent: lowered CPU and memory overhead
+* [IMPROVEMENT] Add support for ignoring an endpoint by name
+
 ## 0.3.20 (September 3, 2014)
 
 * [BUGFIX] Fix app name fetching on Windows for `skylight setup`

data/lib/skylight/cli.rb

@@ -70,15 +70,26 @@ repository and deploy from there. You can learn more about the process at:
             begin
               namefile = Tempfile.new('skylight-app-name')
               # Windows appears to need double quotes for `rails runner`
-              `rails runner "File.open('#{namefile.path}', 'w') {|f| f.write(Rails.application.class.name) }"`
+              `rails runner "File.open('#{namefile.path}', 'w') {|f| f.write(Rails.application.class.name) rescue '' }"`
               name = namefile.read.split("::").first.underscore.titleize
+              name = nil if name.empty?
+            rescue => e
+              if ENV['DEBUG']
+                puts e.class.name
+                puts e.to_s
+                puts e.backtrace.join("\n")
+              end
             ensure
               namefile.close
               namefile.unlink
             end
+
+            unless name
+              warn "Unable to determine Rails application name. Using directory name."
+            end
           end
 
-          if !name || name.strip.empty?
+          unless name
             name = File.basename(File.expand_path('.')).titleize
           end
 

data/lib/skylight/config.rb

@@ -71,12 +71,11 @@ module Skylight
       "SSL_CERT_PATH"                => :'daemon.ssl_cert_path',
       "SSL_CERT_DIR"                 => :'daemon.ssl_cert_dir',
 
-      # == Legacy settings ==
+      # == Legacy env vars ==
       #
-      'AGENT_MAX_MEMORY'        => :'agent.max_memory',
-      'ME_AUTHENTICATION'       => :'me.authentication',
-      'ME_CREDENTIALS_PATH'     => :'me.credentials_path',
-      'TEST_IGNORE_TOKEN'       => :'test.ignore_token' }
+      'AGENT_LOCKFILE'      => :'agent.lockfile',
+      'AGENT_SOCKFILE_PATH' => :'agent.sockfile_path',
+    }
 
     # Default values for Skylight configuration keys
     DEFAULTS = {
@@ -130,6 +129,12 @@ module Skylight
       :'daemon.ssl_cert_dir',
       :'daemon.ssl_cert_path' ]
 
+    # Maps legacy config keys to new config keys
+    LEGACY = {
+      :'agent.sockfile_path' => :'daemon.sockdir_path',
+      :'agent.pidfile_path'  => :'agent.lockfile',
+    }
+
     VALIDATORS = {
       :'agent.interval' => [lambda { |v, c| Integer === v && v > 0 }, "must be an integer greater than 0"]
     }
@@ -161,7 +166,7 @@ module Skylight
 
       if p
         p.each do |k, v|
-          @priority[k.to_sym] = v
+          @priority[Config.remap_key(k)] = v
         end
       end
     end
@@ -196,6 +201,11 @@ module Skylight
       self.load(nil, nil, env)
     end
 
+    def self.remap_key(key)
+      key = key.to_sym
+      LEGACY[key] || key
+    end
+
     # @api private
     def self.remap_env(env)
       ret = {}
@@ -246,16 +256,42 @@ module Skylight
         end
       end
 
+      sockdir_path = self[:'daemon.sockdir_path'] || File.expand_path('.')
+      pidfile_path = self[:'daemon.pidfile_path'] || File.expand_path('skylight.pid', sockdir_path)
+
+      check_permissions(pidfile_path, sockdir_path)
+
       true
     end
 
+    def check_permissions(pidfile, sockdir_path)
+      pidfile_root = File.dirname(pidfile)
+
+      FileUtils.mkdir_p pidfile_root
+      FileUtils.mkdir_p sockdir_path
+
+      if File.exist?(pidfile)
+        if !FileTest.writable?(pidfile)
+          raise "`#{pidfile}` not writable. Please set daemon.pidfile_path or daemon.sockdir_path in your config to a writable path."
+        end
+      else
+        if !FileTest.writable?(pidfile_root)
+          raise "`#{pidfile_root}` not writable. Please set daemon.pidfile_path or daemon.sockdir_path in your config to a writable path."
+        end
+      end
+
+      unless FileTest.writable?(sockdir_path)
+        raise "`#{sockdir_path}` not writable. Please set daemon.sockdir_path in your config to a writable path."
+      end
+    end
+
     def key?(key)
-      key = key.to_sym
+      key = Config.remap_key(key)
       @priority.key?(key) || @values.key?(key)
     end
 
     def get(key, default = nil, &blk)
-      key = key.to_sym
+      key = Config.remap_key(key)
 
       return @priority[key] if @priority.key?(key)
       return @values[key]   if @values.key?(key)
@@ -282,7 +318,7 @@ module Skylight
           set(k, v, key)
         end
       else
-        k = key.to_sym
+        k = Config.remap_key(key)
 
         if validator = VALIDATORS[k]
           blk, msg = validator
@@ -294,7 +330,7 @@ module Skylight
           end
         end
 
-        if @regexp && key =~ @regexp
+        if @regexp && k =~ @regexp
           @priority[$1.to_sym] = val
         end
 
@@ -326,6 +362,7 @@ module Skylight
       ret = []
 
       ENV_TO_KEY.each do |k, v|
+        next if LEGACY[v]
         c = get(v)
         # Always need to pass daemon lib_path config even when default
         if c != DEFAULTS[v] || ALWAYS_INCLUDE_IN_ENV.include?(v)

data/lib/skylight/util/platform.rb

@@ -29,7 +29,7 @@ module Skylight
       when /amd64|x86_64/
         "x86_64"
       when /i?86|x86|i86pc/
-        "i386"
+        "x86"
       when /ppc|powerpc/
         "powerpc"
       when /^arm/

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport