emptyd 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30169c9b6b2194aa9463c384bca30e153180adb
-  data.tar.gz: 1cbb92a9adb7026e0753b540bc48229547e26da0
+  metadata.gz: 3fda361182421082855d749acd1a551aa6e91945
+  data.tar.gz: 8241b5977d1abedae42f7ca337a2a97edef3b23c
 SHA512:
-  metadata.gz: 863c278fa138f2a375a7324f385684c609c253acb478d59a8a642aa9340bf4720bef71b4829ed5f634c7d3307f53717e5cc1d5e1403be5e174ca34eb59b855ac
-  data.tar.gz: 721c1cfbcf09a778de8121062eef223292fc182d6f44c1f8eea7815a7e33f925ac747633de7d6ac41cb787323e0da7eea981b8339c6009025cbd4c2b9bee8bfd
+  metadata.gz: 3069fa9c80e7c57db53f45a3fa5a4831caab1ac53af6030fce57c7b1338aa976a1771f41388ddd51bfcbfaacaeb36829728df186c7a7597b7b186c92d1f82ff6
+  data.tar.gz: 418666a78701ae6ce58a443f8d0b8f9a3cac7acec237ea5d81b31254bf7e6b360aee176830fd3fd042e2c02f6c2cabb3a2207439901433370d3470ac5f09a5f6

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.*.*sw[ponm]

data/bin/emptyd

@@ -13,6 +13,10 @@ require 'evma_httpserver'
 class MyHttpServer < EM::Connection
   include EM::HttpServer
 
+  def initialize(logger)
+    @logger = logger
+  end
+
   def post_init
     super
     no_environment_strings
@@ -21,7 +25,7 @@ class MyHttpServer < EM::Connection
   def process_http_request
     done = false
     port, ip = Socket.unpack_sockaddr_in(get_peername)
-    Emptyd::LOG.info "#{ip}:#{port} #{@http_request_method} #{@http_path_info} #{@http_post_content.inspect}"
+    @logger.info "#{ip}:#{port} #{@http_request_method} #{@http_path_info} #{@http_post_content.inspect}"
 
     response = EM::DelegatedHttpResponse.new(self)
     response.status = 200
@@ -31,7 +35,7 @@ class MyHttpServer < EM::Connection
     begin
       case @http_path_info
       when %r{/session/new}
-        session = Emptyd::Session.new JSON.load(@http_post_content)
+        session = Emptyd::Session.new JSON.parse(@http_post_content, :symbolize_names => true).merge(:logger => @logger)
         response.content = JSON.dump({id: session.uuid})
       when %r{/session/(.*)/run}
         Emptyd::Session[$1].run @http_post_content
@@ -46,6 +50,9 @@ class MyHttpServer < EM::Connection
             response.send_response
           end
         end
+      when %r{/session/(.*)/write}
+        session = Emptyd::Session[$1]
+        session << @http_post_content
       when %r{/session/(.*)/terminate}
         session = Emptyd::Session[$1]
         session.terminate @http_post_content
@@ -70,8 +77,24 @@ class MyHttpServer < EM::Connection
   end
 end
 
+CONFIG = {
+  :server => "::1",
+  :server_port => 53353
+}
+
+%w{.emptyd.conf .empty.conf}.map{|name| File.expand_path("~/#{name}")}.each do |name|
+  next unless File.exist? name
+  File.open(name) do |file|
+    CONFIG.merge!(JSON.parse(file, :symbolize_names => true)) do |k, x, y| 
+      x.respond_to?(:merge) ? x.merge(y) : y
+    end
+  end
+end
+
 EM.run do
-  EM.start_server '0.0.0.0', 8080, MyHttpServer
-  Emptyd::LOG.info "Server started on port 8080."
+  $0 = "emptyd"
+  logger = Logger.new(STDOUT)
+  EM.start_server CONFIG[:server], CONFIG[:server_port], MyHttpServer, logger
+  logger.info "Server started on #{CONFIG[:server]}, port #{CONFIG[:server_port]}."
 end
 

data/lib/emptyd/version.rb

@@ -1,3 +1,3 @@
 module Emptyd
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/emptyd.rb

@@ -7,9 +7,6 @@ require 'securerandom'
 require 'json'
 
 module Emptyd
-  $0 = "emptyd"
-  LOG = Logger.new(STDERR)
-
   class Connection
     attr_reader :key, :updated_at, :failed_at, :error
     EXPIRE_INTERVAL = 600 # 10min
@@ -18,13 +15,14 @@ module Emptyd
     @@connections = {}
     @@count = {}
 
-    def self.[](key)
-      @@connections[key] or Connection.new(key)
+    def self.[](key, logger)
+      @@connections[key] or Connection.new(key, logger)
     end
 
-    def initialize(key)
+    def initialize(key, logger)
       raise IOError, "already registered" if @@connections[key]
       @key = key
+      @logger = logger
       @sessions = []
       @user, @host = key.split('@', 2)
       @user, @host = "root", @user if @host.nil?
@@ -50,7 +48,7 @@ module Emptyd
           conn.close
         end.resume
       end
-      LOG.debug "Destroying connection #{@key}"
+      @logger.debug "Destroying connection #{@key}"
     end
 
     def start
@@ -63,7 +61,7 @@ module Emptyd
           if c
             c.destroy
           else
-            LOG.debug "pressure: no free connections: #{@@count.keys}"
+            @logger.debug "pressure: no free connections: #{@@count.keys}"
           end
         end
       end
@@ -72,31 +70,22 @@ module Emptyd
         begin
           pressure[]
           if @@count.size >= MAX_CONNECTIONS
-            LOG.debug "Quota exceeded by #{@key}: #{@@count.size}"
+            @logger.debug "Quota exceeded by #{@key}: #{@@count.size}"
             @start_timer = EM::PeriodicTimer.new(rand(1..10)) do
               pressure[]
               if @@count.size < MAX_CONNECTIONS
                 @start_timer.cancel
                 EM.next_tick starter
               else
-                LOG.debug "No more connection quota, deferring #{@key}..."
+                @logger.debug "No more connection quota, deferring #{@key}..."
               end
             end
           else
             @@count[self.key] = self
-            LOG.debug "Created new conn: #{key}, quota = #{@@count.size}"
+            @logger.debug "Created new conn: #{key}, quota = #{@@count.size}"
             EM::Ssh.start(@host, @user, user_known_hosts_file: []) do |conn|
-              conn.errback do |err|
-                @@count.delete self.key
-                @conn = nil
-                STDERR.puts "Connection to #{@key} is broken: #{err}"
-                @error = err
-                @failed_at = Time.now
-                @connecting = false
-                @run_queue.each do |cmd,session,callback|
-                  callback.call self, :error
-                end
-              end
+              conn.errback { |err| errback err }
+              conn.on(:closed) { errback "closed" }
               conn.callback do |ssh|
                 @conn = ssh
                 @error = nil
@@ -105,7 +94,7 @@ module Emptyd
                 @connecting = false
                 @run_queue.each do |cmd,session,callback|
                   if session.dead?
-                    LOG.debug "Dropping pending run request from a dead session"
+                    @logger.debug "Dropping pending run request from a dead session"
                     @error = "session is dead"
                   else
                     EM.next_tick { run cmd, session, &callback }
@@ -134,6 +123,25 @@ module Emptyd
       EM.next_tick starter
     end
 
+    def errback err
+      @@count.delete self.key
+      had_valid_conn = !!@conn
+      @conn = nil
+      STDERR.puts "Connection to #{@key} is broken: #{err}"
+      @error = err
+      @failed_at = Time.now
+      @connecting = false
+      if had_valid_conn
+        @sessions.each do |session|
+          session.queue.push [self, :error, nil]
+        end
+      else
+        @run_queue.each do |cmd,session,callback|
+          callback.call self, :error
+        end
+      end
+    end
+
     def bind(session)
       raise IOError, "already bound" if @sessions.include? session
       @sessions << session
@@ -151,36 +159,56 @@ module Emptyd
         return
       end
 
-      @conn.open_channel do |ch|
-        ch.exec cmd do |ch, success|
-          callback.call self, :init, ch
-
-          STDERR.puts "#{h}: exec failed: #{cmd}" unless success
-          ch.on_data do |c, data|
-            EM.next_tick do
-              @updated_at = Time.now
-              session.queue.push [@key,nil,data]
-            end
-          end
+      setup = proc do |ch|
+        callback.call self, :init, ch
 
-          ch.on_extended_data do |c, type, data|
-            EM.next_tick do
-              @updated_at = Time.now
-              session.queue.push [@key,type,data]
-              LOG.debug [type,data]
-            end
+        ch.on_data do |c, data|
+          EM.next_tick do
+            @updated_at = Time.now
+            session.queue.push [@key,nil,data]
           end
+        end
 
-          ch.on_request "exit-status" do |ch, data|
-            EM.next_tick do
-              @updated_at = Time.now
-              session.queue.push [@key,:exit,data.read_long]
-            end
+        ch.on_extended_data do |c, type, data|
+          EM.next_tick do
+            @updated_at = Time.now
+            session.queue.push [@key,type,data]
+            @logger.debug [type,data]
           end
+        end
 
-          ch.on_close do
+        ch.on_request "exit-status" do |ch, data|
+          EM.next_tick do
             @updated_at = Time.now
-            callback.call self, :close
+            session.queue.push [@key,:exit,data.read_long]
+          end
+        end
+
+        ch.on_close do
+          @updated_at = Time.now
+          p "closed"
+          callback.call self, :close
+        end
+
+        ch.on_open_failed do |ch, code, desc|
+          EM.next_tick do
+            callback.call self, :error, desc
+          end
+        end
+      end
+
+      @conn.open_channel do |ch|
+        if session.interactive?
+          ch.request_pty do |ch, success|
+            ch.exec cmd do |ch, success|
+              STDERR.puts "exec failed: #{cmd}" unless success
+              setup[ch]
+            end
+          end
+        else
+          ch.exec cmd do |ch, success|
+            STDERR.puts "exec failed: #{cmd}" unless success
+            setup[ch]
           end
         end
       end
@@ -204,7 +232,7 @@ module Emptyd
   end
 
   class Session
-    attr_reader :uuid, :queue
+    attr_reader :uuid, :queue, :logger
     @@sessions = {}
 
     def self.ids
@@ -215,11 +243,18 @@ module Emptyd
       @@sessions[uuid] or raise KeyError, "no such session"
     end
 
-    def initialize keys, &callback
+    def interactive?
+      @interactive
+    end
+
+    def initialize options, &callback
+      keys = options[:keys]
+      @interactive = !!options[:interactive]
+      @logger = options[:logger]
       @uuid = SecureRandom.uuid
       @@sessions[@uuid] = self
       @keys = keys
-      @connections = Hash[keys.map{|h| [h, Connection[h]]}]
+      @connections = Hash[keys.map{|h| [h, Connection[h, @logger]]}]
       @connections.each_value{|h| h.bind self}
       @queue = EM::Queue.new
       @running = {}
@@ -228,7 +263,7 @@ module Emptyd
     end
 
     def destroy
-      LOG.debug "Destroying session #{@uuid}"
+      @logger.debug "Destroying session #{@uuid}"
       p @running.map{|h,v| [h, v.class.name]}
       @running.each do |h,v| 
         if v.respond_to? :close
@@ -278,6 +313,14 @@ module Emptyd
       }
     end
 
+    def << data
+      @running.each do |k,v|
+        if v.respond_to? :send_data
+          v.send_data data
+        end
+      end
+    end
+
     def terminate key
       chan = @running[key]
       conn = @connections[key]
@@ -293,7 +336,7 @@ module Emptyd
 
     def callback(h,e,c=nil)
       EM.next_tick do
-        LOG.debug [h.key,e,c.nil?]
+        @logger.debug [h.key,e,c.nil?]
         case e
         when :init
           @queue.push [h.key,:start,nil]
@@ -301,17 +344,17 @@ module Emptyd
         when :close, :error
           h.unbind self unless @dead or not @connections.include? h.key
           @connections.delete h.key
-          @queue.push [h.key,:dead,nil] if e == :error
+          @queue.push [h.key,:dead,c] if e == :error
           @queue.push [h.key,:done,nil]
           @running.delete h.key
           if done?
             @queue.push [nil,:done,nil] 
-            LOG.debug "run is done."
+            @logger.debug "run is done."
           else
-            LOG.debug "#{@running.size} connections pending"
+            @logger.debug "#{@running.size} connections pending"
           end
         else
-          LOG.error "Session#run: unexpected callback #{e}"
+          @logger.error "Session#run: unexpected callback #{e}"
         end
       end
     end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: emptyd
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kmeaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An HTTP interface to run a single command on a cluster.
@@ -74,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Run commands on multiple hosts over SSH