nfagent 0.0.1 → 0.0.99

data/Manifest.txt

@@ -1,6 +1,5 @@
 Rakefile
 lib/nfagent.rb
-lib/nfagent.init
 lib/nfagent
 lib/nfagent/cli.rb
 lib/nfagent/base64.rb
@@ -18,5 +17,6 @@ bin/squid_log_writer
 PostInstall.txt
 History.txt
 Manifest.txt
-nfagent.init
 nfagent.conf
+nfagent.init.ubuntu.txt
+nfagent.init.redhat.txt

data/Rakefile

@@ -11,7 +11,7 @@ $hoe = Hoe.spec('nfagent') do |p|
   p.post_install_message = 'PostInstall.txt'
   p.rubyforge_name       = p.name
   p.extra_deps         = [
-    ['svutil','>= 0.0.3'],
+    ['svutil','>= 0.0.3'], ['eventmachine', '>= 0.12.8']
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/lib/nfagent.rb

@@ -24,5 +24,5 @@ require 'nfagent/server'
 require 'nfagent/cli'
 
 module NFAgent
-  VERSION = '0.0.1'
+  VERSION = '0.0.99'
 end

data/lib/nfagent/server.rb

@@ -9,10 +9,6 @@ module NFAgent
       EM.run {
         EM.start_server "0.0.0.0", 10000, Event, chunk_handler
       }
-
-      #Tail.tail(Config.proxy_log) do |line|
-      #  chunk_handler.submit(line)
-      #end
     end
   end
 end

data/nfagent.init.redhat.txt

@@ -0,0 +1,57 @@
+#!/bin/bash
+#cortex
+#
+# chkconfig: 345 80 10
+# description: NetFox Agent
+
+. /etc/rc.d/init.d/functions
+
+NFAGENT_OPTS="-f /etc/nfagent.conf -d"
+NFAGENT_PID=/var/run/nfagent.pid
+
+if [ -f /etc/sysconfig/nfagent ]; then
+  . /etc/sysconfig/nfagent
+fi
+
+start () {
+  echo -n "Starting NetFox Agent: "
+  /usr/bin/nfagent $NFAGENT_OPTS -i $NFAGENT_PID
+  echo "Done"
+}
+
+stop() {
+  echo -n $"Shutting down NetFox Agent: "
+  if [ -f $NFAGENT_PID ]; then
+    kill `cat $NFAGENT_PID`
+    sleep 1
+    echo "Done"
+  else
+    echo "NetFox Agent wasn't running"
+  fi
+}
+
+# See how we were called.
+case "$1" in
+  start)
+    start
+    ;;
+  stop)
+    stop
+    ;;
+  restart)
+    stop
+    sleep 2
+    start
+    RETVAL=$?
+    ;;
+  status)
+    status nfagent
+    RETVAL=$?
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|restart|status}"
+    exit 1
+esac
+
+exit $RETVAL
+

data/{nfagent.init → nfagent.init.ubuntu.txt}

@@ -14,7 +14,8 @@ set -e
 
 # /etc/init.d/pgship: start and stop the PGShip WAL Shipping Service
 
-PGSHIP_OPTS="-f /etc/nfagent.conf -d"
+NFAGENT_OPTS="-f /etc/nfagent.conf -d"
+NFAGENT_PID="/var/run/nfagent.pid"
 
 # Are we running from init?
 run_by_init() {
@@ -26,7 +27,7 @@ export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 case "$1" in
   start)
 	log_daemon_msg "NetFox Agent" "nfagent"
-	if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/pgship.pid --exec /usr/sbin/pgship.bin -- $PGSHIP_OPTS; then
+	if start-stop-daemon --start --quiet --oknodo --pidfile $NFAGENT_PID --exec /usr/bin/nfagent -- $NFAGENT_OPTS; then
 	    log_end_msg 0
 	else
 	    log_end_msg 1
@@ -34,7 +35,7 @@ case "$1" in
 	;;
   stop)
 	log_daemon_msg "NetFox Agent" "nfagent"
-	if start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/pgship.pid; then
+	if start-stop-daemon --stop --quiet --oknodo --pidfile $NFAGENT_PID; then
 	    log_end_msg 0
 	else
 	    log_end_msg 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nfagent
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.99
 platform: ruby
 authors: 
 - Daniel Draper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 +09:30
+date: 2009-11-05 00:00:00 +10:30
 default_executable: nfagent
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.12.8
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   type: :development
@@ -54,10 +64,11 @@ extra_rdoc_files:
 - PostInstall.txt
 - History.txt
 - Manifest.txt
+- nfagent.init.ubuntu.txt
+- nfagent.init.redhat.txt
 files: 
 - Rakefile
 - lib/nfagent.rb
-- lib/nfagent.init
 - lib/nfagent/cli.rb
 - lib/nfagent/base64.rb
 - lib/nfagent/encoder.rb
@@ -74,8 +85,9 @@ files:
 - PostInstall.txt
 - History.txt
 - Manifest.txt
-- nfagent.init
 - nfagent.conf
+- nfagent.init.ubuntu.txt
+- nfagent.init.redhat.txt
 has_rdoc: true
 homepage: 
 licenses: []

data/lib/nfagent.init

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# nfagent    This shell script takes care of starting and stopping
-#
-# chkconfig: 345 98 98
-# description: The NetFox logging agent
-
-start () {
-
-}