fdk 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78e0e2f31ccc1881218c6a3ecfe5fc8a98bab525c4710ffb8e63ffec58bcaaa0
-  data.tar.gz: ed342e0ba43d13b0cced1488bb111a9de258fedf77df2105f3ea4ef9bfd59aaf
+  metadata.gz: bf44c78f30f73ef02883f583ed7d3d1718a5f32e58fb04cbcf5e61730a8a0792
+  data.tar.gz: 4c997f610e8d1b6a654fba5ce0362a05abe70bd1fab035e7a007b063c47fac56
 SHA512:
-  metadata.gz: eb1b8a8c907a33fd5d40ff70e8346c52352ccebcda056923707285bf8a13127664b7bb6cbb3e6170503beb7d479262053b6fb043e3000fef81cec410d5d7d021
-  data.tar.gz: 401cdd0d0e13ffba1155e4a54c61281c0d8f07d7d8754395df92807f596595cd599eb0aa43c3224ee33ac8a2d40527b16cd777a0968debc722647933c6ae9632
+  metadata.gz: b3212288e1ede41978bd0489b5a4ee95371cbcfa04e0514103b80819ed43e9abd1126e0325babf0294eb01c392b3d994e1151449eac190dcd988623f8d342522
+  data.tar.gz: 22224118f8a1be06f74c16f4c85a09a7033c2d3aced3e41e6b39ff64b900b56180054f452cd8683944f4390180c967a8dd87649954c176225729a4de98b2a94f

data/lib/fdk.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "fdk/version"
 require_relative "fdk/runner"
 require_relative "fdk/context"

data/lib/fdk/call.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FDK
   # Call represents a call to the target function or lambda
   class Call

data/lib/fdk/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 
 module FDK

data/lib/fdk/function.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FDK
   # Function represents a function function or lambda
   class Function

data/lib/fdk/listener.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FDK
   # Represents the socket that Fn uses to communicate
   # with the FDK (and thence the function)
@@ -9,13 +11,16 @@ module FDK
   #
   # Fn waits for the socket_path to be created and then connects
   class Listener
-    attr_reader :url, :private_socket
+    attr_reader :url, :private_socket, :fn_logframe_name, :fn_logframe_hdr
 
     def initialize(url:)
       if url.nil? || !url.start_with?("unix:/")
         raise "Missing or invalid socket URL in FN_LISTENER."
       end
 
+      @fn_logframe_name = ENV["FN_LOGFRAME_NAME"]
+      @fn_logframe_hdr = ENV["FN_LOGFRAME_HDR"]
+
       @url = url
       @private_socket = UNIXServer.open(private_socket_path)
     end
@@ -46,10 +51,10 @@ module FDK
 
     def handle_request(fn_block:)
       local_socket = socket.accept
-      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-      resp = WEBrick::HTTPResponse.new(WEBrick::Config::HTTP)
+      req, resp = new_req_resp
       req.parse(local_socket)
       FDK.debug "got request #{req}"
+      log_frame_header(req.header)
       fn_block.call(req, resp)
       resp["Connection"] = "close" # we're not using keep alives sadly
       resp.send_response(local_socket)
@@ -57,6 +62,12 @@ module FDK
       local_socket.close
     end
 
+    def new_req_resp
+      req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+      resp = WEBrick::HTTPResponse.new(WEBrick::Config::HTTP)
+      [req, resp]
+    end
+
     def socket_path
       @socket_path ||= url[5..url.length]
     end
@@ -64,5 +75,26 @@ module FDK
     def private_socket_path
       socket_path + ".private"
     end
+
+    def log_frame_header(headers)
+      return unless logframe_vars_exist
+
+      k = @fn_logframe_hdr.downcase
+      v = headers[k]
+      return if v.nil? || v.empty?
+
+      frm = "\n#{@fn_logframe_name}=#{v[0]}\n"
+      $stderr.print frm
+      $stderr.flush
+      $stdout.print frm
+      $stdout.flush
+    end
+
+    def logframe_vars_exist
+      return false if @fn_logframe_name.nil? || @fn_logframe_name.empty? ||
+                      @fn_logframe_hdr.nil? || @fn_logframe_hdr.empty?
+
+      true
+    end
   end
 end

data/lib/fdk/runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "webrick"
 require "fileutils"
 require "json"
@@ -7,7 +9,7 @@ require "set"
 # Executes it with input
 # Responds with output
 module FDK
-  FDK_LOG_THRESHOLD = "FDK_LOG_THRESHOLD".freeze
+  FDK_LOG_THRESHOLD = "FDK_LOG_THRESHOLD"
   FDK_LOG_DEBUG = 0
   FDK_LOG_DEFAULT = 1
 

data/lib/fdk/support_classes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FDK
   # ParsedInput stores raw input and can parse it as
   # JSON (add extra formats as required)

data/lib/fdk/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FDK
-  VERSION = "0.0.19".freeze
+  VERSION = "0.0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fdk
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Travis Reeder
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json