nerve_pharmeasy 0.7.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96f37374f15b066eacf7833cb06faef30224a39a
-  data.tar.gz: 8624695e4fc87319b269677cf569609f8234f4d4
+  metadata.gz: 1d71214339372c271297aac1d226a4ef3bf694b3
+  data.tar.gz: e7cbb58ec88be70a5f54ac7252fd25ee9d6b72c2
 SHA512:
-  metadata.gz: bd3e57c8772333023e549f773aba55d00cf3f1739df69613e5405cd03e80efdde713464a9b9a139680356ce92c3a1b897406e31cb00bee51076ba28c5038ff1a
-  data.tar.gz: d1dd241aeee363d3df102aa49e3b6577c244dee8800c38d6a6dfccc91cff790356f5b24b3e03bdba5357ef005e2ff5ce6bce864f3823af5d307dc9989f83d681
+  metadata.gz: addce5efe61fa03d250146170c2549466b16d08e51018ad0dc9cc0aa39331f0100928cfce88bc7a78cf7cff7edeeb0078f7fff1ff6b9ae50f8a4d013efca060a
+  data.tar.gz: c9a4c6118af4779093dfe23107b0c104e3b295363050bf3e11475abe4ef1952c702f56b17eae1eac45221bb57698e3279053010afc867bffabdcc55c92dacca8

data/lib/nerve.rb

@@ -2,7 +2,6 @@ require 'fileutils'
 require 'logger'
 require 'json'
 require 'timeout'
-require 'socket'
 
 require 'nerve/version'
 require 'nerve/utils'
@@ -11,8 +10,6 @@ require 'nerve/ring_buffer'
 require 'nerve/reporter'
 require 'nerve/service_watcher'
 
-require 'nerve/configuration_manager'
-
 module Nerve
   class Nerve
     include Logging
@@ -50,20 +47,24 @@ module Nerve
       log.debug 'nerve: completed init'
     end
 
+    def local_ip
+      orig = Socket.do_not_reverse_lookup
+      Socket.do_not_reverse_lookup =true # turn off reverse DNS resolution temporarily
+      UDPSocket.open do |s|
+        s.connect '64.233.187.99', 1 #google
+        s.addr.last
+      end
+    ensure
+      Socket.do_not_reverse_lookup = orig
+    end
+
     def load_config!
       log.info 'nerve: loading config'
       @config_to_load = false
-
       @config_manager.reload!
       config = @config_manager.config
-
-      config.each do|key, value|
-        log.info key
-        log.info value
-      end
-
+      
       services = config["services"]
-
       services.each do|service, data|
         log.info "service:"+service
         host = data["host"]
@@ -73,11 +74,7 @@ module Nerve
              data["host"]=local_ip
         end
       end
-
-      #kedar @config_manager = ConfigurationManager.new()
-      #kedar @config_manager.setConfig(@config)
-
-
+ 
       # required options
       log.debug 'nerve: checking for required inputs'
       %w{instance_id services}.each do |required|
@@ -88,17 +85,6 @@ module Nerve
       @heartbeat_path = config['heartbeat_path']
     end
 
-    def local_ip
-      orig = Socket.do_not_reverse_lookup
-      Socket.do_not_reverse_lookup =true # turn off reverse DNS resolution temporarily
-      UDPSocket.open do |s|
-        s.connect '64.233.187.99', 1 #google
-        s.addr.last
-      end
-    ensure
-      Socket.do_not_reverse_lookup = orig
-    end
-
     def run
       log.info 'nerve: starting main run loop'
       begin

data/lib/nerve/configuration_manager.rb

@@ -1,13 +1,8 @@
 require 'yaml'
 require 'optparse'
-require 'nerve/log'
-require 'logger'
-
 
 module Nerve
   class ConfigurationManager
-    include Logging
-
     attr_reader :options
     attr_reader :config
 
@@ -44,10 +39,6 @@ EOB
         end
       end
       optparse.parse!
-      options.each do|key, value|
-        log.info key
-        log.info value
-      end
       options
     end
 
@@ -56,7 +47,6 @@ EOB
     end
 
     def generate_nerve_config(options)
-
       config = parse_config_file(options[:config])
       config['services'] ||= {}
 
@@ -94,12 +84,6 @@ EOB
       raise "You must parse command line options before reloading config" if @options.nil?
       @config = generate_nerve_config(@options)
     end
-
-    def setConfig(configuration)
-     @config = configuration
-     @options = {}
-     @options[:check_config]=false
-    end
   end
 end
 

data/lib/nerve/version.rb

@@ -1,3 +1,3 @@
 module Nerve
-  VERSION = "0.8.0"
+  VERSION = "0.8.2"
 end

data/nerve_pharmeasy.gemspec

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'nerve/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "nerve_pharmeasy"
+  gem.version       = Nerve::VERSION
+  gem.authors       = ["Martin Rhoads", "Igor Serebryany", "Pierre Carrier"]
+  gem.email         = ["martin.rhoads@airbnb.com", "igor.serebryany@airbnb.com"]
+  gem.description   = "Nerve is a service registration daemon. It performs health "\
+                      "checks on your service and then publishes success or failure "\
+                      "into one of several registries (currently, zookeeper or etcd). "\
+                      "Nerve is half or SmartStack, and is designed to be operated "\
+                      "along with Synapse to provide a full service discovery framework"
+  gem.summary       = %q{A service registration daemon}
+  gem.homepage      = "https://github.com/airbnb/nerve"
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.add_runtime_dependency "json"
+  gem.add_runtime_dependency "zk", "~> 1.9.2"
+  gem.add_runtime_dependency "bunny", "= 1.1.0"
+  gem.add_runtime_dependency "etcd", "~> 0.2.3"
+
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec", "~> 3.1.0"
+  gem.add_development_dependency "factory_girl"
+  gem.add_development_dependency "pry"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nerve_pharmeasy
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Martin Rhoads
@@ -166,8 +166,8 @@ files:
 - lib/nerve/service_watcher/tcp.rb
 - lib/nerve/utils.rb
 - lib/nerve/version.rb
-- nerve.conf.json
 - nerve.gemspec
+- nerve_pharmeasy.gemspec
 - spec/.gitkeep
 - spec/configuration_manager_spec.rb
 - spec/example_services_spec.rb

data/nerve.conf.json

@@ -1,23 +0,0 @@
-{
-  "instance_id": "mymachine",
-  "services": {
-    "nodejs": {
-      "host": "localhost",
-      "port": 3000,
-      "reporter_type": "zookeeper",
-      "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
-        }
-      ]
-    }
-  
-  }
-}