traut 0.1.1 → 0.1.2

data/lib/traut/server.rb

@@ -15,7 +15,7 @@ module Traut
         AMQP.connect(:host => @amqp[:host], :port => @amqp[:port]) do |connection|
           @log.info "Connected to AMQP at #{@amqp[:host]}:#{@amqp[:port]}"
           channel  = AMQP::Channel.new(connection)
-          exchange = channel.topic("traut", :auto_delete => true)
+          exchange = channel.topic('traut')
 
           @actions.each { |route, script|
             @log.info("Registering #{script} for route #{route}")

data/lib/traut/version.rb

@@ -1,3 +1,3 @@
 module Traut
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/samples/kili

@@ -5,7 +5,7 @@ require 'optparse'
 require 'net/ssh'
 require 'json'
 require 'yaml'
-require 'amqp'
+require 'bunny'
 require 'logger'
 
 trap(:INT) { puts; exit }
@@ -21,6 +21,7 @@ options = {
     :port => '22',
     :user => 'nobody',
     :keys => '~/.ssh/id_rsa',
+    :command => 'gerrit stream-events'
   }
 }
 optparse = OptionParser.new do|opts|
@@ -43,6 +44,9 @@ optparse = OptionParser.new do|opts|
   opts.on( '--ssh_user USER', 'SSH user for host.') do |su|
     options[:ssh][:user] = su
   end
+  opts.on( '--command CMD', 'Command to run through SSH exec.') do |cmd|
+    options[:ssh][:command] = cmd
+  end
   opts.on( '-l', '--log LOG', 'The log location of Kili') do |log|
     options[:logs] = log
   end
@@ -59,50 +63,43 @@ log.level = Logger::INFO
 amqp = options[:amqp]
 sshd = options[:ssh]
 
-loop do
-  begin
-    EventMachine.run do
-      AMQP.connect(:host => amqp[:host]) do |connection|
-        log.info "Connected to AMQP at #{amqp[:host]}:#{amqp[:port]}"
-        channel  = AMQP::Channel.new(connection)
-        exchange = channel.topic("traut", :auto_delete => true)
-
-        Net::SSH.start(sshd[:host], sshd[:user],
-          :port => sshd[:port], :keys => sshd[:keys].split(',')) do |ssh|
-          log.info "SSH connection to #{sshd[:host]}:#{sshd[:port]} as #{sshd[:user]} made."
+Net::SSH.start(sshd[:host], sshd[:user],
+  :port => sshd[:port], :keys => sshd[:keys].split(',')) do |ssh|
+  log.info "SSH connection to #{sshd[:host]}:#{sshd[:port]} as #{sshd[:user]} made."
 
-          channel = ssh.open_channel do |ch|
-            ch.exec "gerrit stream-events" do |ch, success|
-              abort "could not stream gerrit events" unless success
+  bunny = Bunny.new(:host => amqp[:host], :port => amqp[:port])
+  bunny.start
+  log.info "AMQP connection made to #{amqp[:host]}:#{amqp[:port]}"
 
-              # "on_data" is called when the process writes something to
-              # stdout
-              ch.on_data do |c, data|
-                json = JSON.parse(data)
-                if json['type'] == 'change-merged'
-                  log.info("Received change-merged event.")
-                  project = json['change']['project']
-                  exchange.publish(data, "com.carepilot.event.code.review.#{project}")
-                else
-                  log.info("Ignoring event of type #{json['type']}")
-                end
-              end
+  exch = bunny.exchange('traut', :durable => false, :passive => true, :auto_delete => true)
 
-              # "on_extended_data" is called when the process writes
-              # something to stderr
-              ch.on_extended_data do |c, type, data|
-                log.error(data)
-              end
+  channel = ssh.open_channel do |ch|
+    ch.exec sshd[:command] do |ch, success|
+      abort "could not stream #{sshd[:command]}" unless success
 
-              ch.on_close { log.info('Connection closed') }
-            end
-          end
-
-          channel.wait
+      # "on_data" is called when the process writes something to
+      # stdout
+      ch.on_data do |c, data|
+        json = JSON.parse(data)
+        if json['type'] == 'change-merged'
+          project = json['change']['project']
+          route = "com.carepilot.event.code.review.#{project}"
+          exch.publish(data, :key => route)
+          log.info("Published #{data} over #{route}")
+        else
+          log.info("Ignoring event of type #{json['type']}")
         end
       end
+
+      # "on_extended_data" is called when the process writes
+      # something to stderr
+      ch.on_extended_data do |c, type, data|
+        log.error(data)
+      end
+
+      ch.on_close { log.info('Connection closed') }
     end
-  rescue Net::SSH::Exception => e
-    log.error("Connection died with exception #{e}. Restarting...")
   end
+
+  channel.wait
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traut
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000Z
+date: 2011-11-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &76444620 !ruby/object:Gem::Requirement
+  requirement: &71562050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *76444620
+  version_requirements: *71562050
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &76444360 !ruby/object:Gem::Requirement
+  requirement: &71561500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *76444360
+  version_requirements: *71561500
 - !ruby/object:Gem::Dependency
   name: systemu
-  requirement: &76444090 !ruby/object:Gem::Requirement
+  requirement: &71560720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *76444090
+  version_requirements: *71560720
 description: Traut is a configurable daemon for running localhost commands in response
   to events generated elsewhere. AMQP is used as the interchange. Traut can make application
   deployments in response to code checkins, automate database failover and anything
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: traut
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Turns AMQP events to system command execution