jets 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 921ded61512a3d89dd910a7af606e589b2c64b3fb6269cc0804cc39aee2da037
-  data.tar.gz: faf32f17f5b2fab7a1067c7dd656d26d6ccdace59fcd2c2e6898f24420e088b5
+  metadata.gz: 2b8471d0065ecdd475bc5aa957e80691f71a7754a5cbb7aad66f30b559ee4fc3
+  data.tar.gz: 196bcb78a37694d17849d9ee16153bb39f7ceb85a1e5d3e9eece9499125cbe13
 SHA512:
-  metadata.gz: 7963cd9338daca100b5e0b4c60e24c9f4d0d92153b21e3f10f1a060ff9b4d015a499ab4ae54c6d3ee804e32ecd7c1c64cdaa9d2bb2155308f85ae1c6316af7d7
-  data.tar.gz: 3e19e2c9d11d048712aee34bba5036c6995fc35d429a058e7015d025c419f86713b02c7886eaf9cb9677dc9a8df78ca55c7e6af65b79d77002b2488abd81bb4c
+  metadata.gz: c922aa0f644d331e387f448673da9bc674fa9b78095646a686a815f557ee34d6525f3ea186a35b3f04ca51caab699352a86aac7fa7a15e7a7124676c1b2105a3
+  data.tar.gz: 3973fc0339e6f8a7d2a1d720df63024e9ad7be143ae82e5c78ebd0970a3e50d0e23cababcae79795eed6c449683e30704d26bbc44349c216ee21e276f1ea0364

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.5.3]
+- add x-jets-prewarm-count and x-jets-call-count headers: pull request #10 from tongueroo/call-count
+- adjust default prewarming concurrency to 2
+- Jets.eager_load as part of warmup
+- rename config.prewarm.enable
+- update docs
+
 ## [0.5.2]
 - format the js error in the node shim properly
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.5.2)
+    jets (0.5.3)
       actionpack
       actionview
       activerecord

data/lib/jets/core.rb

@@ -77,5 +77,39 @@ module Jets::Core
   def version
     Jets::VERSION
   end
+  
+  def eager_load!
+    Dir.glob("#{Jets.root}app/**/*.rb").select do |path|
+      next if !File.file?(path) or path =~ %r{/javascript/} or path =~ %r{/views/}
+
+      class_name = path
+                    .sub(/\.rb$/,'') # remove .rb
+                    .sub(/^\.\//,'') # remove ./
+                    .sub(/app\/\w+\//,'') # remove app/controllers or app/jobs etc
+                    .classify
+      puts "eager_load! loading path: #{path} class_name: #{class_name}" if ENV['DEBUG']
+      class_name.constantize # dont have to worry about order.
+    end
+  end
+
+  # NOTE: In development this will always be 1 because the app gets reloaded.
+  # On AWS Lambda, this will be ever increasing until the container gets replaced.
+  @@call_count = 0
+  def increase_call_count
+    @@call_count += 1
+  end
+
+  def call_count
+    @@call_count
+  end
+
+  @@prewarm_count = 0
+  def increase_prewarm_count
+    @@prewarm_count += 1
+  end
+
+  def prewarm_count
+    @@prewarm_count
+  end
 
 end

data/lib/jets/internal/app/jobs/jets/preheat_job.rb

@@ -1,7 +1,7 @@
 class Jets::PreheatJob < ApplicationJob
-  enabled = Jets.config.prewarm.enabled
+  enabled = Jets.config.prewarm.enable
   ENABLED = enabled.nil? ? true : enabled # defaults to enabled
-  CONCURRENCY = Jets.config.prewarm.concurrency || 1
+  CONCURRENCY = Jets.config.prewarm.concurrency || 2
   PREWARM_RATE = Jets.config.prewarm.rate || '30 minutes'
   torching = ENABLED && CONCURRENCY > 1
   warming = ENABLED && CONCURRENCY == 1

data/lib/jets/processors/main_processor.rb

@@ -31,13 +31,19 @@ class Jets::Processors::MainProcessor
       result = instance_eval(deducer.code, deducer.path)
       # result = PostsController.process(event, context, "create")
 
+      Jets.increase_call_count
+      if result.is_a?(Hash) && result["headers"]
+        result["headers"]["x-jets-call-count"] = Jets.call_count
+        result["headers"]["x-jets-prewarm-count"] = Jets.prewarm_count
+      end
+
       # Puts the return value of project code to stdout because this is
       # what eventually gets used by API Gateway.
       # Explicitly using $stdout since puts has been redirected to $stderr.
       #
       # JSON.dump is pretty robust.  If it cannot dump the structure into a
       # json string, it just dumps it to a plain text string.
-      Jets::Util.normalize_result(result) # String
+      resp = Jets::Util.normalize_result(result) # String
     rescue Exception => e
       # Customize error message slightly so nodejs shim can process the
       # returned error message.

data/lib/jets/ruby_server.rb

@@ -17,6 +17,7 @@ module Jets
     def run
       $stdout.sync = true
       Jets.boot # outside of child process for COW
+      Jets.eager_load!
 
       # INT - ^C
       trap('INT') do
@@ -67,6 +68,7 @@ module Jets
 
     def prewarm_request(event)
       # JSON.dump("prewarmed_at" => Time.now.to_s)
+      Jets.increase_prewarm_count
       %Q|{"prewarmed_at":"#{Time.now.to_s}"}| # raw json for speed
     end
 

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/vendor/lambdagem/lib/lambdagem/extract/gem.rb

@@ -13,7 +13,7 @@ module Lambdagem::Extract
     VERSION_PATTERN = /-(\d+\.\d+\.\d+.*)/
 
     def run
-      puts "Looking for #{full_gem_name} gem in s3 bucket: #{@options[:s3]}"
+      puts "Looking for #{full_gem_name} gem in: #{@options[:lambdagems_url]}"
       clean_downloads(:gems) if @options[:clean]
       tarball_path = download_gem
       remove_current_gem

data/vendor/lambdagem/lib/lambdagem/extract/ruby.rb

@@ -11,7 +11,7 @@ module Lambdagem::Extract
     class NotFound < RuntimeError; end
 
     def run
-      puts "Looking for #{full_ruby_name} in S3 bucket: #{@options[:s3]}"
+      puts "Looking for #{full_ruby_name}"
       clean_downloads(:rubies) if @options[:clean]
       tarball_path = download_ruby
       unpack_tarball(tarball_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Tung Nguyen