nerve 0.2.1 → 0.3.0

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -19,4 +18,4 @@ tmp
 \#*\#
 .\#*
 vendor
-.vagrant
+.vagrant

data/.mailmap

@@ -0,0 +1,2 @@
+<igor.serebryany@airbedandbreakfast.com> <igor47@moomers.org>
+<martin.rhoads@airbnb.com> <ermal14@gmail.com>

data/Gemfile.lock

@@ -0,0 +1,27 @@
+PATH
+  remote: .
+  specs:
+    nerve (0.3.0)
+      bunny (= 1.0.0.rc2)
+      zk (~> 1.9.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    amq-protocol (1.8.0)
+    bunny (1.0.0.rc2)
+      amq-protocol (>= 1.8.0)
+    little-plugger (1.1.3)
+    logging (1.7.2)
+      little-plugger (>= 1.1.3)
+    zk (1.9.2)
+      logging (~> 1.7.2)
+      zookeeper (~> 1.4.0)
+    zookeeper (1.4.7)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  nerve!

data/README.md

@@ -38,6 +38,7 @@ The config file is composed of two main sections:
 
 * `instance_id`: the name under which your services will be registered in zookeeper
 * `services`: the hash (from service name to config) of the services nerve will be monitoring
+* `service_conf_dir`: path to a directory in which each json file will be interpreted as a service with the basename of the file minus the .json extension
 
 ### Services Config ###
 

data/bin/nerve

@@ -31,20 +31,31 @@ end
 # parse command line arguments
 optparse.parse!
 
-
-# parse nerve config file
-begin
-  config = JSON::parse(File.read(options[:config]))
-rescue TypeError => e
-  raise ArgumentError, "you must pass in a '--config' option"
-rescue Errno::ENOENT => e
-  raise ArgumentError, "config file does not exist:\n#{e.inspect}"
-rescue Errno::EACCES => e
-  raise ArgumentError, "could not open config file:\n#{e.inspect}"
-rescue JSON::ParserError => e
-  raise "config file #{options[:config]} is not json:\n#{e.inspect}"
+def parseconfig(filename)
+  # parse synapse config file
+  begin
+    c = JSON::parse(File.read(filename))
+  rescue Errno::ENOENT => e
+    raise ArgumentError, "config file does not exist:\n#{e.inspect}"
+  rescue Errno::EACCES => e
+    raise ArgumentError, "could not open config file:\n#{e.inspect}"
+  rescue JSON::ParserError => e
+    raise "config file #{filename} is not json:\n#{e.inspect}"
+  end
+  return c
 end
 
+config = parseconfig(options[:config])
+config['services'] ||= {}
+
+if config.has_key?('service_conf_dir')
+  cdir = File.expand_path(config['service_conf_dir'])
+  if ! Dir.exists?(cdir) then
+    raise "service conf dir does not exist:#{cdir}"
+  end
+  cfiles = Dir.glob(File.join(cdir, '*.json'))
+  cfiles.each { |x| config['services'][File.basename(x[/(.*)\.json$/, 1])] = parseconfig(x) }
+end
 
 # create nerve object
 s = Nerve::Nerve.new config

data/example/nerve.conf.json

@@ -1,5 +1,6 @@
 {
   "instance_id": "mymachine",
+  "service_conf_dir": "example/nerve_services",
   "services": {
     "your_http_service": {
       "port": 3000,

data/example/nerve_services/service1.json

@@ -0,0 +1,16 @@
+{
+  "port": 3000,
+  "host": "127.0.0.1",
+  "zk_hosts": ["localhost:2181"],
+  "zk_path": "/nerve/services/your_http_service/services",
+  "check_interval": 2,
+  "checks": [
+    {
+      "type": "http",
+      "uri": "/health",
+      "timeout": 0.2,
+      "rise": 3,
+      "fall": 2
+    }
+  ]
+}

data/lib/nerve/service_watcher/base.rb

@@ -16,7 +16,7 @@ module Nerve
 
       def up?
         # do the check
-        check_result = !!ignore_errors do
+        check_result = !!catch_errors do
           check
         end
 
@@ -45,6 +45,15 @@ module Nerve
         # otherwise return the last result
         return @last_result
       end
+
+      def catch_errors(&block)
+        begin
+          return yield
+        rescue Object => error
+          log.info "nerve: service check #{@name} got error #{error.inspect}"
+          return false
+        end
+      end
     end
   end
 end

data/lib/nerve/service_watcher/http.rb

@@ -31,10 +31,11 @@ module Nerve
         response = connection.get(@uri)
         code = response.code.to_i
 
-        log.debug "nerve: check #{@name} got response code #{code}"
         if code >= 200 and code < 300
+          log.debug "nerve: check #{@name} got response code #{code} with body \"#{response.body}\""
           return true
         else
+          log.error "nerve: check #{@name} got response code #{code} with body \"#{response.body}\""
           return false
         end
       end

data/lib/nerve/utils.rb

@@ -4,14 +4,5 @@ module Nerve
       res = `#{command}`.chomp
       raise "command '#{command}' failed to run:\n#{res}" unless $?.success?
     end
-
-    def ignore_errors(&block)
-      begin
-        return yield
-      rescue Object => error
-        log.debug "ignoring error #{error.inspect}"
-        return false
-      end
-    end
   end
 end

data/lib/nerve/version.rb

@@ -1,3 +1,3 @@
 module Nerve
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/nerve.rb

@@ -15,18 +15,11 @@ module Nerve
     include Logging
 
     def initialize(opts={})
+      log.info 'nerve: starting up!'
+
       # set global variable for exit signal
       $EXIT = false
 
-      # trap int signal and set exit to true
-      %w{INT TERM}.each do |signal|
-        trap(signal) do
-          $EXIT = true
-        end
-      end
-
-      log.info 'nerve: starting up!'
-
       # required options
       log.debug 'nerve: checking for required inputs'
       %w{instance_id services}.each do |required|
@@ -34,36 +27,43 @@ module Nerve
       end
 
       @instance_id = opts['instance_id']
-
-      # create service watcher objects
-      log.debug 'nerve: creating service watchers'
-      @service_watchers=[]
-      opts['services'].each do |name, config|
-        @service_watchers << ServiceWatcher.new(config.merge({'instance_id' => @instance_id, 'name' => name}))
-      end
+      @services = opts['services']
+      @watchers = {}
 
       log.debug 'nerve: completed init'
     end
 
     def run
       log.info 'nerve: starting run'
-      begin
-        children = []
 
-        log.debug 'nerve: launching service check threads'
-        @service_watchers.each do |watcher|
-          children << Thread.new{watcher.run}
-        end
+      @services.each do |name, config|
+        launch_watcher(name, config)
+      end
 
-        log.debug 'nerve: main thread done, waiting for children'
-        children.each do |child|
-          child.join
-        end
-      ensure
+      begin
+        sleep
+      rescue
+        log.debug 'nerve: sleep interrupted; exiting'
         $EXIT = true
+        @watchers.each do |name, watcher_thread|
+          reap_watcher(name)
+        end
       end
+
       log.info 'nerve: exiting'
+    ensure
+      $EXIT = true
+    end
+
+    def launch_watcher(name, config)
+      log.debug "nerve: launching service watcher #{name}"
+      watcher = ServiceWatcher.new(config.merge({'instance_id' => @instance_id, 'name' => name}))
+      @watchers[name] = Thread.new{watcher.run}
     end
 
+    def reap_watcher(name)
+      watcher_thread = @watchers.delete(name)
+      watcher_thread.join()
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nerve
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
@@ -55,14 +55,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .mailmap
 - .nerve.rc
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - Vagrantfile
 - bin/nerve
 - example/nerve.conf.json
+- example/nerve_services/service1.json
 - lib/nerve.rb
 - lib/nerve/log.rb
 - lib/nerve/reporter.rb