nfagent 0.9.13 → 0.9.15

data/Manifest.txt

@@ -16,6 +16,7 @@ lib/nfagent/client.rb
 lib/nfagent/client_response.rb
 lib/nfagent/config.rb
 lib/nfagent/tail.rb
+lib/nfagent/tests.rb
 lib/nfagent/submitter.rb
 bin/nfagent
 bin/squid_log_writer

data/lib/nfagent.rb

@@ -28,7 +28,8 @@ require 'nfagent/tail'
 require 'nfagent/event'
 require 'nfagent/server'
 require 'nfagent/cli'
+require 'nfagent/tests'
 
 module NFAgent
-  VERSION = '0.9.13'
+  VERSION = '0.9.15'
 end

data/lib/nfagent/cli.rb

@@ -5,6 +5,10 @@ module NFAgent
 
     def initialize
       Config.load_and_parse
+      if Config.test_mode?
+        Tests.run
+        exit 1
+      end
       @process = ProcessManager.new(Server)
       @process.start
     end

data/lib/nfagent/client.rb

@@ -3,7 +3,7 @@ module NFAgent
      SERVICE_HOST = "collector.service.netfox.com"
 
     def self.post(end_point, data_hash)
-      proxy_class = Net::HTTP::Proxy(Config.proxy.host, Config.proxy.port, Config.proxy.user, Config.proxy.password)
+      proxy_class = Net::HTTP::Proxy(Config.http_proxy_host, Config.http_proxy_port, Config.http_proxy_user, Config.http_proxy_password)
       # TODO: Enable SSL
       proxy_class.start(SERVICE_HOST, 80) do |http|
         http.read_timeout = 120 # 2 minutes TODO: Make this a config option with 120 as default

data/lib/nfagent/config.rb

@@ -1,15 +1,11 @@
 module NFAgent
-  class Proxy
-    attr_accessor :host, :port, :user, :password
-  end
-
   RBConfig = Config
 
   class Config < SVUtil::Config
-    @@proxy = Proxy.new
+    @@test_mode = false
 
-    def self.proxy
-      @@proxy
+    def self.test_mode?
+      @@test_mode
     end
 
     class << self
@@ -31,6 +27,9 @@ module NFAgent
           opts.on("-D", "--dump-dir [dir]", "Dump directory for failed chunks") do |dir|
             Config.dump_dir = dir
           end
+          opts.on("-T", "--test", "Run connection tests") do
+            @@test_mode = true
+          end
         end
       end
     end

data/lib/nfagent/tests.rb

@@ -0,0 +1,8 @@
+module NFAgent
+  class Tests
+    def self.run
+      poller = Poller.new
+      poller.send_heartbeat
+    end
+  end
+end

data/nfagent.conf

@@ -1,5 +1,4 @@
 client_key = 1234
-proxy_log = /tmp/access.log
 dump_dir = /tmp/dumps
 log_file = /tmp/debug
 pid_file = /tmp/nfagent.pid

data/nfagent.init.ubuntu.txt

@@ -12,8 +12,6 @@
 set -e
 . /lib/lsb/init-functions
 
-# /etc/init.d/pgship: start and stop the PGShip WAL Shipping Service
-
 NFAGENT_OPTS="-f /etc/nfagent.conf -d"
 NFAGENT_PID="/var/run/nfagent.pid"
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 13
-  version: 0.9.13
+  - 15
+  version: 0.9.15
 platform: ruby
 authors: 
 - Daniel Draper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 +09:30
+date: 2010-10-27 00:00:00 +10:30
 default_executable: nfagent
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,9 +68,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 6
+        - 4
         - 0
-        version: 2.6.0
+        version: 2.4.0
   type: :development
   version_requirements: *id004
 description: Logging Agent for NetFox Online
@@ -105,6 +105,7 @@ files:
 - lib/nfagent/client_response.rb
 - lib/nfagent/config.rb
 - lib/nfagent/tail.rb
+- lib/nfagent/tests.rb
 - lib/nfagent/submitter.rb
 - bin/nfagent
 - bin/squid_log_writer