abalone 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd7313af2ef199663a12440718471b9d2eff311
-  data.tar.gz: fa3cf73aeda53912d5125f2a762362b43f85aca8
+  metadata.gz: aa5b5ee45c18c4e1c7e2db9945967b297d0820da
+  data.tar.gz: 8baf74e20587c757447985d794195a21d879f965
 SHA512:
-  metadata.gz: 6ca11182e225316c971cee0f75f7d6cd27e137d0ded674810379a6e6576ff09d386d39d367a3dc2f32108c44d699b4ddfc42c5777dc150882413991702596bb9
-  data.tar.gz: 7c8e6175f921726e7ddcfcb4f1b9a7f147e314ebcb11d3dc99b0ece9f85c58485865c1408dc3cfd793623b7e36dbb47f86067b8537ba2c507210fa0e778b0b84
+  metadata.gz: a7c9247504cc5c6840796e6287b70436d727793a93c0f66f5c9fb340d356810952cfee98cf32c3c1114d2c14413a2a6a70464969688899c8f564a41038ca382b
+  data.tar.gz: 3909b638e6695e1633e55919798cca9fce3aec5c3db0ee383f667e78c00e9a572547b1ff7004b70e417860f16a753b5a46b3c6e39165ed41c12c9752995f2f9f

data/bin/abalone

@@ -86,6 +86,14 @@ if options.include? :ssh
   raise "SSH configuration must include the host" unless options[:ssh].include? :host
 end
 
+# If we're running under systemd, start a watchdog to let it know we're still alive.
+# If four sequential pings fail, then systemd will kill & respawn us.
+if ENV.include? 'WATCHDOG_USEC'
+  require 'abalone/watchdog'
+  # 1/4 of the timeout period, in seconds
+  Abalone::Watchdog.new(Integer(ENV['WATCHDOG_USEC'])/4000000, options)
+end
+
 puts
 puts
 puts "Starting Abalone Web Shell. Browse to http://localhost:#{options[:port]}"

data/lib/abalone.rb

@@ -24,6 +24,12 @@ class Abalone < Sinatra::Base
 
   }
 
+  # super low cost heartbeat response.
+  # Add this first to ensure that the user route doesn't take precedence.
+  get '/heartbeat/ping' do
+    'alive'
+  end
+
   get '/?:user?' do
     if !request.websocket?
       #redirect '/index.html'

data/lib/abalone/watchdog.rb

@@ -0,0 +1,31 @@
+class Abalone::Watchdog
+  def initialize(period, options)
+    raise 'Watchdog needs a port to be set' unless options.include? :port
+    raise 'Watchdog needs a logger to be set' unless options.include? :logger
+    logger = options[:logger]
+
+    Thread.new do
+      require 'net/http'
+      sleep 5 # give the service time to wake up
+
+      logger.warn "Starting watchdog with period #{period}"
+      loop do
+        http = Net::HTTP.new('localhost', options[:port])
+        http.open_timeout = 1
+        http.read_timeout = 1
+        begin
+          http.start
+          http.request_get('/heartbeat/ping') do |res|
+            logger.debug "Heartbeat response: #{res.read_body}"
+            system('systemd-notify WATCHDOG=1')
+          end
+        rescue => e
+          logger.warn 'Abalone service failed heartbeat check!'
+          logger.debug e.message
+        end
+
+        sleep period
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abalone
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -52,8 +52,8 @@ files:
 - README.md
 - LICENSE
 - bin/abalone
+- lib/abalone/watchdog.rb
 - lib/abalone.rb
-- bin/em.rb
 - views/index.erb
 - public/index.html
 - public/js/abalone.js

data/bin/em.rb

@@ -1,50 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'rubygems'
-require "eventmachine"
-
-
-module ProcessWatcher
-  def receive_data(data)
-    puts "Got: #{data}"
-  end
-  def process_exited
-    puts 'the forked child died!'
-  end
-end
-
-pid = fork{
-  sleep 1
-  puts 'booger'
-  sleep 1
-  puts 'oogles'
-}
-
-EM.kqueue=true
-EventMachine.run {
-  EventMachine.watch_process(pid, ProcessWatcher)
-  EventMachine.add_timer(5){ Process.kill('TERM', pid) }
-}
-
-#EM.run{
-#  EM.system('sh', proc { |process|
-#    process.send_data("echo hello\n")
-#    process.send_data("exit\n")
-#    sleep 5
-#    EM.stop
-#  },
-#  proc{ |out,status|
-#    puts(out)
-#  })
-#}
-
-#EM.run do
-#  EM.add_periodic_timer(1) { puts 'sec' }
-#  EM.add_timer(1.01) { puts '1 second passed by' }
-#  EM.add_timer(2.01) { puts '2 seconds passed by'; }
-#  EM.add_timer(5.01) do
-#    puts '5 seconds passed by: stopping...'
-#    EM.stop
-#  end
-#end
-