villein 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 312c4f44e76ab04dfc5432713777cab81fe3b841
-  data.tar.gz: de6c4fcf92f268aff30976f55a10efdd53631f89
+  metadata.gz: af36f01ce7087aedfc374cb6541e40bbb91a8321
+  data.tar.gz: 83612d9193d206eed0770bcee0fbba3ce773e258
 SHA512:
-  metadata.gz: be8f871517ddb03e03db209d76351546068805aa6d7e4fae44903f0444a944aece28d630551c14333c0b7ec72039280d2047776da780251882e96c9438ad325b
-  data.tar.gz: d1944855fe12a066af5a9bc54a91be22ca47bb09aee40f809e1f09d47fe3a415e65a20c78bf21e70c7f3f48eaeffadd5819e7a1803e901f7efb5855a182d429f
+  metadata.gz: 40b1b349f00083a0e2a662c03f4e82a13d1d204f0a95e480197c58879fdf7f79a6d5ba8384b64072b7c84907f053623a021a4aaa371043630329868c19f3ff45
+  data.tar.gz: 43e8c0e97b37961345414d56b9544d3e93818ed2215ef0b39bebb904072f3c5e04fabb921e1b7793056df45bbdc955b6aac1784034b1247924c64c32e6983871

data/.gitignore

@@ -20,3 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
+*.dSYM
+misc/villein-event-handler

data/.travis.yml

@@ -16,6 +16,7 @@ notifications:
   email:
     - travis-ci@sorah.jp
 before_script:
+  - ruby extconf.rb
   - mkdir -p vendor/serf
   - curl -L -o vendor/serf/serf.zip https://dl.bintray.com/mitchellh/serf/0.6.0_linux_amd64.zip
   - unzip -d vendor/serf vendor/serf/serf.zip

data/Makefile

@@ -0,0 +1,4 @@
+all:
+		@echo ok
+install:
+		@echo ok

data/extconf.rb

@@ -0,0 +1,15 @@
+# This extconf doesn't configure Ruby C extension, just builds
+# misc/villein-event-handler which is out of ruby environment.
+#
+require 'rbconfig'
+require 'fileutils'
+
+exit if /mswin/ === RUBY_PLATFORM
+
+misc = File.join(File.dirname(__FILE__), 'misc')
+src = File.join(File.dirname(__FILE__), 'src')
+
+Kernel.exec RbConfig::CONFIG["CC"],
+  "-Wall",
+  "-o", File.join(misc, 'villein-event-handler'),
+  File.join(src, 'villein-event-handler.c')

data/lib/villein/agent.rb

@@ -13,8 +13,14 @@ module Villein
     class NotRunning < Exception; end
     class ResponderExists < Exception; end
 
-    EVENT_HANDLER_SH = File.expand_path(File.join(__dir__, '..', '..', 'misc', 'villein-event-handler'))
-
+    EVENT_HANDLER_NATIVE = File.expand_path(File.join(__dir__, '..', '..', 'misc', 'villein-event-handler'))
+    EVENT_HANDLER_RB = File.expand_path(File.join(__dir__, '..', '..', 'misc', 'villein-event-handler.rb'))
+
+    EVENT_HANDLER = if File.exist?(EVENT_HANDLER_NATIVE)
+                      EVENT_HANDLER_NATIVE
+                    else
+                      EVENT_HANDLER_RB
+                    end
     def initialize(serf: 'serf',
                    node: Socket.gethostname,
                    rpc_addr: '127.0.0.1:7373', bind: nil, iface: nil, advertise: nil,
@@ -23,7 +29,8 @@ module Villein
                    encrypt: nil, profile: nil, protocol: nil,
                    event_handlers: [], replay: nil,
                    tags: {}, tags_file: nil,
-                   log_level: :info, log: File::NULL)
+                   log_level: :info, log: File::NULL,
+                   villein_handler: EVENT_HANDLER)
       @serf = serf
       @name = node
       @rpc_addr = rpc_addr
@@ -34,6 +41,7 @@ module Villein
       @custom_event_handlers, @replay = event_handlers, replay
       @initial_tags, @tags_file = tags, tags_file
       @log_level, @log = log_level, log
+      @villein_handler = villein_handler
 
       @hooks = {}
       @responders = {}
@@ -141,7 +149,7 @@ module Villein
 
       cmd << [
         '-event-handler',
-        [EVENT_HANDLER_SH, *event_listener_addr].join(' ')
+        [@villein_handler, *event_listener_addr].join(' ')
       ]
 
       @custom_event_handlers.each do |handler|
@@ -239,15 +247,16 @@ module Villein
     end
 
     def event_listener_loop
-      while sock = @event_listener_server.accept
-        Thread.new do
+      loop do
+        Thread.new(@event_listener_server.accept) do |sock|
           begin
-            buf = ""
+            buf, obuf = "", ""
             loop do
               socks, _, _ = IO.select([sock], nil, nil, 5)
               break unless socks
 
-              socks[0].read_nonblock(1024, buf)
+              socks[0].read_nonblock(2048, obuf)
+              buf << obuf
               break if socks[0].eof?
             end
 
@@ -259,9 +268,14 @@ module Villein
       end
     end
 
-    def handle_event(json, sock)
-      event_payload = JSON.parse(json)
-      event = Event.new(event_payload['env'], payload: event_payload['input'])
+    def handle_event(payload, sock)
+      env_payload, input = payload.split(/\0\0/,2) # ['name=val', 'name=val', '', 'input']
+
+      env = Hash[env_payload.split(/\0/).map do |line|
+        line.split(/=/,2)
+      end]
+
+      event = Event.new(env, payload: input)
 
       @event_received = true
 

data/lib/villein/version.rb

@@ -1,3 +1,3 @@
 module Villein
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/misc/villein-event-handler.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+#require 'json'
+require 'socket'
+
+sock = TCPSocket.new(ARGV[0], ARGV[1].to_i)
+sock.set_encoding(Encoding::ASCII_8BIT)
+
+
+ENV.each do |name, value|
+  next unless name.start_with?('SERF'.freeze)
+
+  sock.write "#{name}=#{value}\0"
+end
+
+sock.write "\0"
+sock.write $stdin.read
+sock.close_write
+
+if ENV["SERF_EVENT"] == "query"
+  $stdout.write sock.read
+end

data/spec/event_handler_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+require 'socket'
+
+describe 'event handler' do
+  %w(villein-event-handler villein-event-handler.rb).each do |handler_name|
+    _handler = File.join(__dir__, '..', 'misc', handler_name)
+    opts = File.exist?(_handler) ? {} : {pending: "#{handler_name} not exists"}
+    describe handler_name, opts do
+      let(:handler) { _handler }
+
+      def run_handler(env: {'SERF_EVENT' => 'user', 'SERF_USER_EVENT' => 'test'}, input: nil, response: nil)
+        serv = TCPServer.new('localhost', 0)
+        sockout = nil
+        serv_thread = Thread.new do
+          begin
+            sock = serv.accept
+
+            sockout = sock.read
+            sock.write response if response
+            sock.close_write
+          ensure
+            sock.close if sock && !sock.closed?
+            serv.close if serv && !serv.closed?
+          end
+        end
+        serv_thread.abort_on_exception = true
+
+        stdout = nil
+        IO.popen([env, handler, serv.addr[-1].to_s, serv.addr[1].to_s], 'r+') do |io|
+          io.write(input) if input
+          io.close_write
+          stdout = io.read
+          Process.waitpid2 io.pid
+        end
+
+        serv_thread.join
+        return stdout, sockout
+      end
+
+      it "reports environment variables" do
+        stdout, sockout = run_handler
+        expect(sockout).to include("SERF_EVENT=user\0")
+        expect(sockout).to include("SERF_USER_EVENT=test\0")
+        expect(sockout).to match(/(user|test)\0\0\z/)
+      end
+
+      it "pass stdin to socket" do
+        stdout, sockout = run_handler(input: "foo\n")
+        expect(sockout).to include("SERF_EVENT=user\0")
+        expect(sockout).to match(/(user|test)\0\0foo\n\z/m)
+      end
+
+      context "if SERF_EVENT=query" do
+        it "pass socket input to stdout" do
+          stdout, sockout = run_handler(env: {'SERF_EVENT' => 'query'}, input: "foo\n", response: "bar\n")
+          expect(sockout).to match(/SERF_EVENT=query\0\0foo\n\z/m)
+          expect(stdout).to eq("bar\n")
+        end
+      end
+    end
+  end
+end

data/src/villein-event-handler.c

@@ -0,0 +1,187 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <errno.h>
+
+#include <string.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <fcntl.h>
+#include <sys/select.h>
+
+#include <netdb.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#define BUFSIZE 2048
+
+typedef struct {
+  const char *hostname;
+  const char *port;
+  struct addrinfo *host_head;
+  int sock;
+} Mission;
+
+extern char **environ;
+
+void
+cleanup(Mission *mission)
+{
+  if (mission->host_head != NULL)
+    freeaddrinfo(mission->host_head);
+  if (mission->sock != -1)
+    close(mission->sock);
+}
+
+int
+is_query_p()
+{
+  return getenv("SERF_EVENT") != NULL && strcmp(getenv("SERF_EVENT"), "query") == 0;
+}
+
+void
+enable_nonblock(Mission *mission, int fd)
+{
+  errno = 0;
+  unsigned int flags = fcntl(fd, F_GETFL);
+
+  if (errno != 0) {
+    perror("oops: F_GETCL");
+    exit(1);
+  }
+
+  if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
+    perror("oops: F_SETCL");
+    exit(1);
+  }
+}
+
+void
+connect_villein(Mission *mission)
+{
+  int err;
+  struct addrinfo hints, *host;
+
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_socktype = SOCK_STREAM;
+  hints.ai_family = PF_UNSPEC;
+
+  if ((err = getaddrinfo(mission->hostname, mission->port, &hints, &mission->host_head)) != 0) {
+    fprintf(stderr, "oops: getaddrinfo(%s, %s) error: %s\n", mission->hostname, mission->port, gai_strerror(err));
+    exit(1);
+  }
+
+  for(host = mission->host_head; host != NULL; host = host->ai_next) {
+    if ((mission->sock = socket(host->ai_family, host->ai_socktype, host->ai_protocol)) < 0) {
+      continue;
+    }
+
+    if (connect(mission->sock, host->ai_addr, host->ai_addrlen) != 0) {
+      close(mission->sock);
+      continue;
+    }
+
+    break;
+  }
+
+  if (host == NULL) {
+    fprintf(stderr, "failed to connect host");
+    cleanup(mission);
+    exit(1);
+  }
+}
+
+void
+report_environ(Mission *mission)
+{
+  char **env = environ;
+
+  while (*env) {
+    write(mission->sock, *env, strlen(*env) + 1); /* \0 */
+    env++;
+  }
+  write(mission->sock, "\0", 1);
+}
+
+void
+copy_stream(Mission *mission, int from_fd, int to_fd)
+{
+  int maxfd = from_fd < to_fd ? to_fd : from_fd;
+  int retval;
+  fd_set rfds;
+  char *buf;
+  buf = malloc(BUFSIZE);
+
+  FD_ZERO(&rfds);
+  FD_SET(from_fd, &rfds);
+
+  struct stat from_fdstat;
+  fstat(from_fd, &from_fdstat);
+
+
+  while (1) {
+    ssize_t count = 0;
+    retval = select(maxfd + 1, &rfds, NULL, NULL, NULL);
+
+    if (retval == -1) {
+      perror("oops: copy select");
+      free(buf);
+      cleanup(mission); exit(1);
+    }
+
+    errno = 0;
+
+    if (S_ISSOCK(from_fdstat.st_mode)) {
+      count = recv(from_fd, buf, BUFSIZE, 0);
+    }
+    else {
+      count = read(from_fd, buf, BUFSIZE);
+    }
+
+    if (errno == EAGAIN || errno == EWOULDBLOCK) continue;
+    if (errno != 0) {
+      perror("oops: copy read");
+      free(buf);
+      cleanup(mission); exit(1);
+    }
+    if (count == 0) break;
+
+    write(to_fd, buf, count);
+  }
+}
+
+int
+main(int argc, const char *argv[])
+{
+  if (argc < 3) {
+    fprintf(stderr, "usage: $0 host port\n");
+    return 2;
+  }
+
+  Mission mission;
+  memset(&mission, 0, sizeof(mission));
+
+  mission.hostname = argv[1];
+  mission.port = argv[2];
+  mission.sock = -1;
+
+  connect_villein(&mission);
+  report_environ(&mission);
+
+  enable_nonblock(&mission, 0);
+  copy_stream(&mission, 0, mission.sock);
+  shutdown(mission.sock, 1); /* close_write */
+
+  if (is_query_p()) {
+    enable_nonblock(&mission, mission.sock);
+    copy_stream(&mission, mission.sock, 1);
+  }
+
+  cleanup(&mission);
+
+  return 0;
+}

data/villein.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.extensions    = ["extconf.rb"]
 
   spec.add_development_dependency "rspec", "2.14.1"
   spec.add_development_dependency "bundler", "~> 1.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: villein
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -71,7 +71,8 @@ email:
 - sorah@cookpad.com
 - her@sorah.jp
 executables: []
-extensions: []
+extensions:
+- extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -79,20 +80,24 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
+- extconf.rb
 - lib/villein.rb
 - lib/villein/agent.rb
 - lib/villein/client.rb
 - lib/villein/event.rb
 - lib/villein/tags.rb
 - lib/villein/version.rb
-- misc/villein-event-handler
+- misc/villein-event-handler.rb
 - spec/agent_spec.rb
 - spec/client_spec.rb
+- spec/event_handler_spec.rb
 - spec/event_spec.rb
 - spec/spec_helper.rb
 - spec/tags_spec.rb
+- src/villein-event-handler.c
 - villein.gemspec
 homepage: ''
 licenses:
@@ -121,6 +126,7 @@ summary: Use `serf` (serfdom.io) from Ruby.
 test_files:
 - spec/agent_spec.rb
 - spec/client_spec.rb
+- spec/event_handler_spec.rb
 - spec/event_spec.rb
 - spec/spec_helper.rb
 - spec/tags_spec.rb

data/misc/villein-event-handler

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-require 'json'
-require 'socket'
-
-sock = TCPSocket.new(ARGV[0], ARGV[1].to_i)
-
-serf_env = Hash[ENV.select{|k,v|/SERF/ =~ k}]
-input = $stdin.read
-
-sock.puts({env: serf_env, input: input}.to_json)
-sock.close_write
-
-if ENV["SERF_EVENT"] == "query"
-  $stdout.write sock.read
-end