tunemygc 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edab5ea70a5d450b7947bd53af538d7a125bcf26
-  data.tar.gz: 5153bc0167c5758d290995c39de56702d91e6617
+  metadata.gz: 2c2faef3f82c3891c957e4de799006540ec4b86c
+  data.tar.gz: 5e12afc1345d92163f7d1ac2d805d8aef48570d0
 SHA512:
-  metadata.gz: 87096291b0dd67012742a0be010d8d60d487e0cc201004709cc60ed9a77311fec247930837d70b0afbe38250489c9a9743e83172612ebca7128183caf74674db
-  data.tar.gz: 665c300107d8a324a1b161f22ba75fec80fbc642095d75dc7ac2e7554355cbc39a91ce94209fa139b5885541d0e115d3985a61e2c4a52f4eed4acd7a275c61a4
+  metadata.gz: 31bb0d362295f2738b385e3b8e108da6ff95374d50c7c6a77a790e02ebaa1fb1210c3446b070a159e1957abdb4520517c0f02adaea01676594cde8f24ea99812
+  data.tar.gz: d4750545d48d6d7e4ff556542f4c6e1d0521aebe14fa1318bc95916a6e341a772631765f30096290bc11511190faf28b93c1bcc838a512b0433bf67ce97794f0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tunemygc (1.0.16)
+    tunemygc (1.0.17)
       activesupport (~> 4.1)
       certified (~> 1.0, >= 1.0.0)
 

data/lib/tunemygc/cli.rb

@@ -1,14 +1,10 @@
 # encoding: utf-8
 
-require 'net/http'
-require 'certified'
-require 'timeout'
+require 'tunemygc/network'
 require 'optparse'
 
 module TuneMyGc
   class CLI
-    TIMEOUT = 30
-
     attr_reader :uri, :client, :options
 
     def self.start(args)
@@ -36,7 +32,7 @@ module TuneMyGc
       @uri = URI("http://#{TuneMyGc::HOST}")
       @client = Net::HTTP.new(@uri.host, @uri.port)
       @client.use_ssl = (uri.port == 443)
-      @client.read_timeout = TIMEOUT
+      @client.read_timeout = NETWORK_TIMEOUT
       register if options[:email]
       fetch_config if options[:config]
     end
@@ -80,7 +76,7 @@ module TuneMyGc
 
     private
     def timeout(&block)
-      Timeout.timeout(TIMEOUT + 1){ block.call }
+      Timeout.timeout(NETWORK_TIMEOUT + 1){ block.call }
     end
   end
 end

data/lib/tunemygc/network.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require 'net/http'
+require 'certified'
+require 'timeout'
+
+module TuneMyGc
+  NETWORK_TIMEOUT = 30 #seconds
+end

data/lib/tunemygc/spies.rb

@@ -16,7 +16,7 @@ module TuneMyGc
       s = if ENV['RUBY_GC_SPY']
         ENV['RUBY_GC_SPY'].classify
       else
-        'ActionController'
+        TuneMyGc.rails? ? 'ActionController' : 'Manual'
       end
       unless @spies.include?(s)
         raise NotImplementedError, "TuneMyGC spy #{s.underscore.inspect} not supported. Valid spies are #{@spies.map(&:underscore)}"

data/lib/tunemygc/syncer.rb

@@ -1,12 +1,9 @@
 # encoding: utf-8
 
-require 'net/http'
-require 'certified'
-require 'timeout'
+require 'tunemygc/network'
 
 module TuneMyGc
   class Syncer
-    TIMEOUT = 30 #seconds
     ENVIRONMENT = [ENV['RUBY_GC_TOKEN'], RUBY_VERSION, Rails.version, ENV.select {|k,v| k =~ /RUBY_GC_/ }, TuneMyGc::VERSION, GC::OPTS, GC::INTERNAL_CONSTANTS].freeze
 
     attr_reader :uri, :client
@@ -15,7 +12,7 @@ module TuneMyGc
       @uri = URI("http://#{host}/ruby")
       @client = Net::HTTP.new(@uri.host, @uri.port)
       @client.use_ssl = (uri.port == 443)
-      @client.read_timeout = TIMEOUT
+      @client.read_timeout = NETWORK_TIMEOUT
     end
 
     def sync(snapshotter)
@@ -44,7 +41,7 @@ module TuneMyGc
 
     private
     def timeout(&block)
-      Timeout.timeout(TIMEOUT + 1){ block.call }
+      Timeout.timeout(NETWORK_TIMEOUT + 1){ block.call }
     end
 
     def sync_with_tuner(snapshotter)

data/lib/tunemygc/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module TuneMyGc
-  VERSION = "1.0.17"
+  VERSION = "1.0.18"
 end

data/lib/tunemygc.rb

@@ -7,12 +7,18 @@ module TuneMyGc
   HEADERS = { "Content-Type" => "application/json",
               "Accept" => "application/json",
               "User-Agent" => "TuneMyGC #{TuneMyGc::VERSION}"}.freeze
+
+  def self.rails?
+    defined?(Rails) && Rails.version >= "4.0"
+  end
 end
 
 if ENV["RUBY_GC_TUNE"]
-  if defined?(Rails) && Rails.version >= "4.0"
+  if TuneMyGc.rails?
+    puts "[TuneMyGC] Rails detected, loading railtie"
     require 'tunemygc/railtie'
   else
+    puts "[TuneMyGC] Rails not detected, loading minimal agent"
     require 'tunemygc/agent'
   end
 else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tunemygc
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Bear Metal
@@ -141,6 +141,7 @@ files:
 - lib/tunemygc/cli.rb
 - lib/tunemygc/configurator.rb
 - lib/tunemygc/interposer.rb
+- lib/tunemygc/network.rb
 - lib/tunemygc/railtie.rb
 - lib/tunemygc/snapshotter.rb
 - lib/tunemygc/spies.rb