nfagent 0.9.50 → 1.0.0

data/bin/squid_log_writer

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'socket'
+require 'optparse'
 
 class Client
   def initialize(host, port)
@@ -34,7 +35,25 @@ class Client
     end
 end
 
-client = Client.new("127.0.0.1", "10000")
+
+options = {
+  port: 10110,
+  host: '127.0.0.1'
+}
+OptionParser.new do |opts|
+  opts.banner = "Usage: squid_log_writer [options]"
+
+  opts.on("-p", "--port", "Submit logs to agent running on port [port]") do |port|
+    options[:port] = port
+  end
+
+  opts.on("-H", "--host", "Submit logs to agent running on host [host]") do |host|
+    options[:host] = host
+  end
+end.parse!
+
+
+client = Client.new(options[:host], options[:port])
 
 while !$stdin.eof?
   line = $stdin.readline

data/lib/nfagent.rb

@@ -36,5 +36,5 @@ require 'nfagent/cli'
 require 'nfagent/tests'
 
 module NFAgent
-  VERSION = '0.9.50'
+  VERSION = '1.0.0'
 end

data/lib/nfagent/client.rb

@@ -1,12 +1,10 @@
 module NFAgent
   class Client
-    # TODO: Make this a config option
-    SERVICE_HOST = "sandbox.netfox.com"
-
     def self.post(end_point, data_hash)
+      Log.info("Submitting to #{Config.service_host} on port #{Config.service_port}")
       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|
+      proxy_class.start(Config.service_host, Config.service_port) do |http|
         http.read_timeout = 120 # 2 minutes TODO: Make this a config option with 120 as default
         req = Net::HTTP::Post.new("/#{end_point}")
         p({"key" => Config.client_key}.merge(data_hash).delete('data'))

data/lib/nfagent/config.rb

@@ -16,12 +16,15 @@ module NFAgent
     # mapping: Class, this is a plugin class which must be stored in a file in the directory /etc/nfagent/plugins/
     # parse: (optional, default: 'remotely'): String, either 'remotely' or 'locally'
     #
-    defaults do |c|
-      c.mode = 'normal'
-      c.parse = 'remotely'
-      c.chunk_timeout = 60
-      c.time_zone = 'UTC'
-      c.plugin_directory = '/etc/nfagent/plugins/'
+    defaults do |config|
+      config.mode             = 'normal'
+      config.parse            = 'remotely'
+      config.chunk_timeout    = 60
+      config.time_zone        = 'UTC'
+      config.plugin_directory = '/etc/nfagent/plugins/'
+      config.service_host     = 'collector.beta.netfox.com'
+      config.service_port     = 80
+      config.agent_port       = 10110
     end
 
     class << self

data/lib/nfagent/server.rb

@@ -1,7 +1,8 @@
 module NFAgent
   class Server
     def run
-      Log.info("Starting up")
+      Log.info("Starting up: Listening on port #{Config.agent_port}")
+      Log.info("Data will be submitted to #{Config.service_host}:#{Config.service_port}")
       NFAgent::Plugin.load_plugins
 
       Log.info("Parsing #{Config.parse}")
@@ -11,7 +12,7 @@ module NFAgent
       poller = Poller.new
 
       EM.run {
-        EM.start_server "0.0.0.0", 10000, Event, chunk_handler, poller
+        EM.start_server "0.0.0.0", Config.agent_port, Event, chunk_handler, poller
         EM::PeriodicTimer.new(5) do
           chunk_handler.check_full_or_expired
         end

data/nfagent.conf

@@ -1,4 +1,4 @@
-client_key = hOFxKEgYEBf1Ni8WqJ02
+client_key = Rfu5eaa0SZo8k4FdzBWo
 dump_dir = sandbox/dumps
 log_file = sandbox/debug
 pid_file = sandbox/nfagent.pid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfagent
 version: !ruby/object:Gem::Version
-  version: 0.9.50
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: svutil
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3602518525496297623
+      hash: -4434578557288111645
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: