nfagent 0.9.30 → 0.9.31

data/lib/nfagent/event.rb

@@ -13,7 +13,7 @@ module NFAgent
       if data && data.length > 10
         @handler.append(data)
       end
-      #send_data('OK')
+      send_data('OK')
     end
 
     def unbind

data/lib/nfagent/payload.rb

@@ -1,6 +1,6 @@
 
 module NFAgent
-  class Payload < Struct.new(:data, :checksum, :filename, :line_count, :chunk_expired, :key)
+  class Payload < Struct.new(:data, :checksum, :filename, :line_count, :chunk_expired)
     def initialize
       yield self
     end
@@ -23,19 +23,16 @@ module NFAgent
     end
 
     def to_hash
-      ret = {
+      {
         "payload" => self.data,
         "checksum" => self.checksum,
         "line_count" => self.line_count,
         "chunk_expired" => self.chunk_expired
       }
-      ret["key"] = self.key unless self.key.blank?
-      ret
     end
 
     def write_to_disk(directory)
-      filename = [ self.checksum, self.attempt, self.key ].compact.join("-")
-      File.open(File.join(directory, filename), "w") do |file|
+      File.open(File.join(directory, "#{self.checksum}-#{self.attempt}"), "w") do |file|
         file << self.data
       end
     end
@@ -51,14 +48,14 @@ module NFAgent
       filename && File.exists?(lockfile)
     end
 
-    def self.read_from_file(filename, dir = Config.dump_dir)
+    def self.read_from_file(filename)
       # Ensure the file is only relative
       filename = File.basename(filename)
       self.new do |payload|
         payload.filename = filename
-        payload.checksum, payload.attempt, payload.key = filename.split("-")
+        payload.checksum, payload.attempt = filename.split("-")
         payload.data = ""
-        ref = File.join(dir, filename)
+        ref = File.join(Config.dump_dir, filename)
         File.open(ref, "r") do |file|
           payload.data << file.read
         end
@@ -71,8 +68,7 @@ module NFAgent
 
     def try_again_later
       # TODO: Move the file to a new name with a later timetamp
-      new_filename = [ self.checksum, self.attempt, self.key ].compact.join("-")
-      FileUtils.mv(File.join(Config.dump_dir, self.filename), File.join(Config.dump_dir, new_filename))
+      FileUtils.mv(File.join(Config.dump_dir, self.filename), File.join(Config.dump_dir, "#{self.checksum}-#{self.attempt}"))
     end
 
     private

data/lib/nfagent/server.rb

@@ -2,11 +2,6 @@ module NFAgent
   class Server
     def run
       Log.info("Starting up")
-      NFAgent::Plugin.load_plugins
-
-      Log.info("Parsing #{Config.parse}")
-      Log.info("Mode set to #{Config.mode}")
-
       chunk_handler = ChunkHandler.new
       poller = Poller.new
 

data/lib/nfagent/submitter.rb

@@ -15,7 +15,6 @@ module NFAgent
         response = Client.post(:collector, @payload.to_hash)
         if response.ok?
           succeed(@payload)
-          Log.info("Submitted #{@payload.line_count} lines")
         else
           Log.error "Submission Failed: #{response.message}"
           fail(@payload)

data/nfagent.conf

@@ -1,4 +1,4 @@
-client_key = FNX3tyOkG6J7nk2uC3QX
-dump_dir = sandbox/dumps
-log_file = sandbox/debug
-pid_file = sandbox/nfagent.pid
+client_key = 1234
+dump_dir = /tmp/dumps
+log_file = /tmp/debug
+pid_file = /tmp/nfagent.pid

metadata

@@ -1,177 +1,148 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nfagent
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 30
-  version: 0.9.30
+version: !ruby/object:Gem::Version
+  version: 0.9.31
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Daniel Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-18 00:00:00 +10:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: svutil
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 3
-        version: 0.1.3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.12
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 8
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.12
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: squiggle
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 8
-        version: 0.0.8
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.8
+- !ruby/object:Gem::Dependency
+  name: newgem
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: Logging Agent for NetFox Online
-email: 
+email:
 - daniel@netfox.com
-executables: 
+executables:
 - nfagent
 - squid_log_writer
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- PostInstall.txt
 - History.txt
 - Manifest.txt
-- PostInstall.txt
+- README.txt
 - nfagent.init.ubuntu.txt
 - nfagent.init.redhat.txt
-files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
-- README.rdoc
+files:
 - Rakefile
-- script/console
-- script/destroy
-- script/generate
-- test/test_chunk.rb
-- test/test_chunk_handler.rb
-- test/test_client.rb
-- test/test_config.rb
-- test/test_helper.rb
-- test/test_mapper_proxy.rb
-- test/test_nfagent.rb
-- test/test_payload.rb
-- test/test_plugin.rb
-- test/config
-- sandbox/dumps/debug
-- test/plugins/my_mapper.rb
 - lib/nfagent.rb
-- lib/nfagent/base64.rb
-- lib/nfagent/chunk.rb
-- lib/nfagent/chunk_handler.rb
 - lib/nfagent/cli.rb
-- lib/nfagent/client.rb
-- lib/nfagent/client_response.rb
-- lib/nfagent/config.rb
+- lib/nfagent/base64.rb
 - lib/nfagent/encoder.rb
-- lib/nfagent/event.rb
-- lib/nfagent/info.rb
+- lib/nfagent/server.rb
+- lib/nfagent/chunk_handler.rb
 - lib/nfagent/log.rb
-- lib/nfagent/mapper_proxy.rb
-- lib/nfagent/object_extra.rb
+- lib/nfagent/info.rb
+- lib/nfagent/event.rb
 - lib/nfagent/payload.rb
-- lib/nfagent/plugin.rb
 - lib/nfagent/poller.rb
-- lib/nfagent/server.rb
-- lib/nfagent/submitter.rb
+- lib/nfagent/chunk.rb
+- 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
+- PostInstall.txt
+- History.txt
+- Manifest.txt
+- README.txt
 - nfagent.conf
 - nfagent.init.ubuntu.txt
 - nfagent.init.redhat.txt
-has_rdoc: true
-homepage: http://github.com/#{github_username}/#{project_name}
+- .gemtest
+homepage: http://netfox.com
 licenses: []
-
 post_install_message: PostInstall.txt
-rdoc_options: 
+rdoc_options:
 - --main
-- README.rdoc
-require_paths: 
+- README.txt
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nfagent
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Logging Agent for NetFox Online
-test_files: 
-- test/test_chunk.rb
-- test/test_chunk_handler.rb
-- test/test_client.rb
-- test/test_config.rb
-- test/test_helper.rb
-- test/test_mapper_proxy.rb
-- test/test_nfagent.rb
-- test/test_payload.rb
-- test/test_plugin.rb
+test_files: []

data/lib/nfagent/mapper_proxy.rb

@@ -1,18 +0,0 @@
-module NFAgent
-  class MapperProxy
-    class << self
-      def instance
-        return @instance if @instance
-        raise "No Mapper Set" if Config.mapper.blank?
-        @instance = Object.const_get(Config.mapper).new
-      end
-
-      # TODO: Can we delegate?
-      def find_account_id(username, client_ip)
-        instance.find_account_id(username, client_ip)
-      end
-
-      # TODO: before shutdown
-    end
-  end
-end

data/lib/nfagent/object_extra.rb

@@ -1,5 +0,0 @@
-class Object
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-end

data/lib/nfagent/plugin.rb

@@ -1,14 +0,0 @@
-module NFAgent
-  class Plugin
-    class << self
-      def load_plugins
-        if Config.plugin_directory && !Config.plugin_directory.empty? && File.exists?(Config.plugin_directory)
-          Dir.glob(File.join(Config.plugin_directory, "*.rb")).each do |file|
-            Log.info("Loading plugin: #{file}")
-            load(file)
-          end
-        end
-      end
-    end
-  end
-end

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/nfagent.rb'}"
-puts "Loading nfagent gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)