scout 5.4.6.alpha → 5.5.0

data/.gitignore

@@ -4,6 +4,6 @@ pkg/*
 **/.DS_Store
 .idea
 working_dir/
-.bundle
 .rvmrc
 Gemfile.lock
+.bundle

data/CHANGELOG

@@ -1,3 +1,20 @@
+== Master
+
+== 5.5.0
+
+* yes, the version number jumped from  5.3.5 to 5.5.0
+* Implemented "real time" mode
+
+== 5.3.5
+
+* Moved proxy support to explicit command line flags --http_proxy and https_proxy
+* fixed two unused variables that were causing warnings under 1.9.3
+
+== 5.3.4
+
+* Incorporating sleep interval into Server#time_to_checkin?
+* Added proxy support command line flags
+
 == 5.3.3
 
 * Sending embedded options to server for local & plugin overrides.

data/bin/scout

@@ -5,7 +5,6 @@ $VERBOSE = true # -w
 #$KCODE   = "u"  # -Ku
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), *%w[.. lib])
-
 require "scout"
 
 Scout::Command.dispatch(ARGV)

data/lib/scout.rb

@@ -9,4 +9,4 @@ require "scout/server_base"
 require "scout/server"
 require "scout/streamer"
 require "scout/daemon_spawn"
-require "scout/streamer_control"
+require "scout/streamer_daemon"

data/lib/scout/command.rb

@@ -72,6 +72,16 @@ module Scout
           options[:server_name] = server_name
         end
 
+        opts.on("--http-proxy URL", String,
+                 "Optional http proxy for non-SSL traffic." ) do |http_proxy|
+          options[:http_proxy] = http_proxy
+        end
+
+        opts.on("--https-proxy URL", String,
+                 "Optional https proxy for SSL traffic." ) do |https_proxy|
+          options[:https_proxy] = https_proxy
+        end
+
         opts.separator " "
         opts.separator "Common Options:"
         opts.separator "--------------------------------------------------------------------------"
@@ -95,16 +105,6 @@ module Scout
           options[:force] = bool
         end
 
-        opts.on( "-p", "--plugin_ids PLUGINS", String,
-                 "A subset of plugin ids, for streaming mode only - not generally used manually.") do |plugins|
-          options[:plugin_ids] = plugins.split(",").map(&:to_i)
-        end
-
-        opts.on( "-k", "--streaming_key KEY", String,
-                 "for streaming mode only - not generally used manually.") do |streaming_key|
-          options[:streaming_key] = streaming_key
-        end
-
         opts.separator " "
         opts.separator "Troubleshooting Options:"
         opts.separator "--------------------------------------------------------------------------"
@@ -164,6 +164,8 @@ module Scout
       @level   = options[:level]   || "info"
       @force   = options[:force]   || false
       @server_name    = options[:server_name]
+      @http_proxy     = options[:http_proxy] || ""
+      @https_proxy    = options[:https_proxy] || ""
 
       @options = options
       @args    = args

data/lib/scout/command/install.rb

@@ -22,7 +22,7 @@ module Scout
 
         puts "\nAttempting to contact the server..."
         begin
-          Scout::Server.new(server, key, history, log) do |scout|
+          Scout::Server.new(server, key, history, log, @http_proxy, @https_proxy) do |scout|
             scout.fetch_plan
             scout.run_plugins_by_plan
           end

data/lib/scout/command/run.rb

@@ -9,7 +9,7 @@ module Scout
         configuration_directory = config_dir
         log.debug("Configuration directory is #{configuration_directory} ") if log
         # TODO: too much external logic of command doing things TO server. This should be moved into the server class.
-        @scout = Scout::Server.new(server, key, history, log, server_name)
+        @scout = Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy)
         @scout.load_history
         
         unless $stdin.tty?
@@ -19,15 +19,15 @@ module Scout
         
         @scout.fetch_plan
 
-        log.info "streamer command=#{@scout.streamer_command}"
-        # Spawn streamer if directed to, or stop it. @scout.streamer_command should only be [start|stop]
-        if @scout.streamer_command.is_a?(String) && @scout.streamer_command.start_with?("start") || @scout.streamer_command == "stop"
-          tokens = @scout.streamer_command.split(",")
-          tokens.shift # gets rid of the "start"
-          streaming_key=tokens.shift
-          plugin_ids = tokens.map(&:to_i)
-          stream=Scout::Command::Stream.new(@options.merge(:streaming_key=>streaming_key,:plugin_ids=>plugin_ids), [key, @scout.streamer_command])
-          stream.run
+        # Spawn or stop streamer as needed
+        if @scout.streamer_command.is_a?(String)
+          if @scout.streamer_command.start_with?("start")
+            log.info "streamer command: start"
+            Scout::StreamerDaemon.start_daemon(history, @scout.streamer_command)
+          elsif @scout.streamer_command == "stop"
+            log.info "streamer command: stop"
+            Scout::StreamerDaemon.stop_daemon(history)
+          end
         end
 
         # Check in if appropriate

data/lib/scout/command/sign.rb

@@ -11,7 +11,7 @@ module Scout
       VERIFY_MODE = OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
       
       def run
-        url, *provided_options = @args
+        url = @args.first
         # read the plugin_code from the file specified
         if url.nil? or url == ''
           puts "Please specify the path to the plugin (scout sign /path/to/plugin.rb)"
@@ -35,7 +35,13 @@ module Scout
         
         puts "Posting Signature..."
         uri = URI.parse(url)
-        http = Net::HTTP.new(uri.host, uri.port)
+
+        # take care of http/https proxy, if specified in command line options
+        # Given a blank string, the proxy_uri URI instance's host/port/user/pass will be nil
+        # Net::HTTP::Proxy returns a regular Net::HTTP class if the first argument (host) is nil
+        proxy_uri = URI.parse(uri.is_a?(URI::HTTPS) ? @https_proxy : @http_proxy)
+        http=Net::HTTP::Proxy(proxy_uri.host,proxy_uri.port,proxy_uri.user,proxy_uri.port).new(uri.host, uri.port)
+
         if uri.is_a?(URI::HTTPS)
           http.use_ssl = true
           http.ca_file     = CA_FILE

data/lib/scout/command/test.rb

@@ -45,7 +45,7 @@ module Scout
           puts "== You haven't provided any options for running this plugin."
         end
 
-        Scout::Server.new(nil, nil, history, log) do |scout|
+        Scout::Server.new(nil, nil, history, log, @http_proxy, @https_proxy) do |scout|
           scout.prepare_checkin
           scout.process_plugin( 'interval'  => 0,
                                 'plugin_id' => 1,

data/lib/scout/server.rb

@@ -26,13 +26,15 @@ module Scout
     attr_reader :streamer_command
 
     # Creates a new Scout Server connection.
-    def initialize(server, client_key, history_file, logger = nil, server_name=nil)
+    def initialize(server, client_key, history_file, logger = nil, server_name=nil, http_proxy='', https_proxy='')
       @server       = server
       @client_key   = client_key
       @history_file = history_file
       @history      = Hash.new
       @logger       = logger
       @server_name  = server_name
+      @http_proxy   = http_proxy
+      @https_proxy   = https_proxy
       @plugin_plan  = []
       @plugins_with_signature_errors = []
       @directives   = {} # take_snapshots, interval, sleep_interval
@@ -231,7 +233,7 @@ module Scout
     def time_to_checkin?
       @history['last_checkin'] == nil ||
               @directives['interval'] == nil ||
-              (Time.now.to_i - Time.at(@history['last_checkin']).to_i).abs+15 > @directives['interval'].to_i*60
+              (Time.now.to_i - Time.at(@history['last_checkin']).to_i).abs+15+sleep_interval > @directives['interval'].to_i*60
     rescue
       debug "Failed to calculate time_to_checkin. @history['last_checkin']=#{@history['last_checkin']}. "+
               "@directives['interval']=#{@directives['interval']}. Time.now.to_i=#{Time.now.to_i}"
@@ -481,7 +483,7 @@ module Scout
       contents=File.read(@history_file)
       begin
         @history = YAML.load(contents)
-      rescue => e
+      rescue
         backup_path=File.join(File.dirname(@history_file), "history.corrupt")
         info "Couldn't parse the history file. Deleting it and resetting to an empty history file. Keeping a backup at #{backup_path}"
         File.open(backup_path,"w"){|f|f.write contents}
@@ -546,9 +548,6 @@ module Scout
       debug $!.message
       debug $!.backtrace
     end
-    
-    
-    private
 
     # Called during initialization; loads the plugin_configs (local plugin configurations for passwords, etc)
     # if the file is there. Returns a hash like {"db.username"=>"secr3t"}

data/lib/scout/streamer.rb

@@ -2,31 +2,34 @@ require 'rubygems'
 require 'json'
 
 module Scout
-  class Streamer < Scout::ServerBase
+  class PluginTimeoutError < RuntimeError; end
+  class Streamer
     MAX_DURATION = 60*30 # will shut down automatically after this many seconds
     SLEEP = 1
 
     # * history_file is the *path* to the history file
     # * plugin_ids is an array of integers
-    def initialize(server, client_key, history_file, plugin_ids, streaming_key, logger = nil)
-      @server       = server
-      @client_key   = client_key
+    def initialize(history_file, streaming_key, p_app_id, p_key, p_secret, plugin_ids, logger = nil)
+      @@continue_streaming = true
       @history_file = history_file
       @history      = Hash.new
       @logger       = logger
 
       @plugin_hashes = []
 
-      Pusher.app_id = '11495'
-      Pusher.key = 'a95aa7293cd158100246'
-      Pusher.secret = '9c13ccfe325fe3ae682d'
+      Pusher.app_id=p_app_id
+      Pusher.key=p_key
+      Pusher.secret=p_secret
+
+      #[[:app_id,p_app_id],[:key,p_key],[:secret,p_secret]].each { |p| Pusher.send p.first, p.last}
 
       streamer_start_time = Time.now
 
       info("Streamer PID=#{$$} starting")
 
       hostname=Socket.gethostname
-      # load history
+
+      # load plugin history
       load_history
 
       # get the array of plugins, AKA the plugin plan
@@ -39,7 +42,7 @@ module Scout
 
       # main loop. Continue running until global $continue_streaming is set to false OR we've been running for MAX DURATION
       iteration=1 # use this to log the data at a couple points
-      while(streamer_start_time+MAX_DURATION > Time.now && $continue_streaming) do
+      while(streamer_start_time+MAX_DURATION > Time.now && @@continue_streaming) do
         plugins=[]
         selected_plugins.each_with_index do |plugin_hash,i|
           # create an actual instance of the plugin
@@ -186,5 +189,10 @@ module Scout
       end
     end
 
+    # class method is used to stop the running deamon
+    def self.continue_streaming=(v)
+      @@continue_streaming=v
+    end
+
   end
 end

data/lib/scout/streamer_daemon.rb

@@ -0,0 +1,58 @@
+module Scout
+  class StreamerDaemon < DaemonSpawn::Base
+
+    # this is the public-facing method for starting the streaming daemon
+    def self.start_daemon(history_file, streamer_command)
+      streamer_log_file=File.join(File.dirname(history_file),"scout_streamer.log")
+      streamer_pid_file=File.join(File.dirname(history_file),"scout_streamer.pid")
+
+      daemon_spawn_options = {:log_file => streamer_log_file,
+                              :pid_file => streamer_pid_file,
+                              :sync_log => true,
+                              :working_dir => File.dirname(history_file)}
+
+      # streamer command might look like: start,A0000000000123,a,b,c,1,3
+      tokens = streamer_command.split(",")
+      tokens.shift # gets rid of the "start"
+      streaming_key = tokens.shift
+      p_app_id = tokens.shift
+      p_key = tokens.shift
+      p_secret = tokens.shift
+      plugin_ids = tokens.map(&:to_i)
+
+      # we use STDOUT for the logger because daemon_spawn directs STDOUT to a log file
+      streamer_args = [history_file,streaming_key,p_app_id,p_key,p_secret,plugin_ids,Logger.new(STDOUT)]
+      if File.exists?(streamer_pid_file)
+        Scout::StreamerDaemon.restart(daemon_spawn_options, streamer_args)
+      else
+        Scout::StreamerDaemon.start(daemon_spawn_options, streamer_args)
+      end
+    end
+
+    # this is the public-facing method for stopping the streaming daemon
+    def self.stop_daemon(history_file)
+      streamer_log_file=File.join(File.dirname(history_file),"scout_streamer.log")
+      streamer_pid_file=File.join(File.dirname(history_file),"scout_streamer.pid")
+
+      daemon_spawn_options = {:log_file => streamer_log_file,
+                              :pid_file => streamer_pid_file,
+                              :sync_log => true,
+                              :working_dir => File.dirname(history_file)}
+
+      Scout::StreamerDaemon.stop(daemon_spawn_options, [])
+    end
+
+
+    # this method is called by DaemonSpawn's class start method.
+    def start(streamer_args)
+      history,streaming_key,p_app_id,p_key,p_secret,plugin_ids,log = streamer_args
+      @scout = Scout::Streamer.new(history, streaming_key, p_app_id, p_key, p_secret, plugin_ids, log)
+    end
+
+    # this method is called by DaemonSpawn's class start method.
+    def stop
+      Scout::Streamer.continue_streaming = false
+    end
+
+  end
+end

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.4.6.alpha"
+  VERSION = "5.5.0"
 end

data/test/scout_test.rb

@@ -409,17 +409,21 @@ mybar=100
 
       scout(@client.key) # to write the initial history file. Sinatra MUST be running
       $continue_streaming = true # so the streamer will run once
-      streamer=Scout::Streamer.new("http://none", "bogus_client_key", PATH_TO_DATA_FILE, [@client.plugins.first.id]+plugins.map(&:id), "bogus_streaming_key",nil) # for debugging, make last arg Logger.new(STDOUT)
-      res = Pusher::Channel.streamer_data  # via the mock_streamer call
+      # for debugging, make last arg Logger.new(STDOUT)
+      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[@client.plugins.first.id]+plugins.map(&:id),nil)
+    end
 
-      assert res.is_a?(Hash)
-      assert res[:plugins].is_a?(Array)
-      assert_equal 4, res[:plugins].size
-      assert_equal 2, res[:plugins][0][:fields][:load]
-      assert_equal 1, res[:plugins][1][:fields][:value]
-      assert_equal 2, res[:plugins][2][:fields][:value]
-      assert_equal 1, res[:plugins][3][:fields][:value]
-    end # end of mock_pusher
+    streams = Pusher::Channel.streamer_data  # set by the mock_pusher call
+    assert streams.is_a?(Array)
+    assert_equal 1, streams.size
+    res=streams.first
+    assert res.is_a?(Hash)
+    assert res[:plugins].is_a?(Array)
+    assert_equal 4, res[:plugins].size
+    assert_equal 2, res[:plugins][0][:fields][:load]
+    assert_equal 1, res[:plugins][1][:fields][:value]
+    assert_equal 2, res[:plugins][2][:fields][:value]
+    assert_equal 1, res[:plugins][3][:fields][:value]
   end
 
   # the local plugin shouldn't report
@@ -435,26 +439,31 @@ mybar=100
 
     mock_pusher do
       $continue_streaming = true # so the streamer will run once
-      streamer=Scout::Streamer.new("http://none", "bogus_client_key", PATH_TO_DATA_FILE, [@client.plugins.first.id], "bogus_streaming_key",nil) # for debugging, make last arg Logger.new(STDOUT)
-      res = Pusher::Channel.streamer_data # Pusher::Channel.streamer_data via the mock_streamer call
+      # for debugging, make last arg Logger.new(STDOUT)
+      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[@client.plugins.first.id],nil)
+    end
+    streams = Pusher::Channel.streamer_data  # set by the mock_pusher call
+    assert streams.is_a?(Array)
+    assert_equal 1, streams.size
+    res=streams.first
 
-      assert res.is_a?(Hash)
-      assert res[:plugins].is_a?(Array)
-      assert_equal 1, res[:plugins].size # this is NOT the local plugin, it's a regular plugin that's already there
-      assert_equal 2, res[:plugins][0][:fields][:load]
-    end # end of mock_pusher
+    assert res.is_a?(Hash)
+    assert res[:plugins].is_a?(Array)
+    assert_equal 1, res[:plugins].size # this is NOT the local plugin, it's a regular plugin that's already there
+    assert_equal 2, res[:plugins][0][:fields][:load]
   end
 
 
   # test streamer starting and stopping
   def test_streamer_process_management
     streamer_pid_file = File.join(AGENT_DIR, "scout_streamer.pid")
+    File.unlink(streamer_pid_file) if File.exist?(streamer_pid_file)
 
     test_should_run_first_time
 
     assert !File.exist?(streamer_pid_file)
 
-    assert @client.update_attribute(:streamer_command, "start,A0000000000123,1,3")
+    assert @client.update_attribute(:streamer_command, "start,A0000000000123,a,b,c,1,3")
     scout(@client.key)
     assert File.exist?(streamer_pid_file)
     process_id = File.read(streamer_pid_file).to_i
@@ -475,15 +484,34 @@ mybar=100
       plugin = create_plugin(@client, "memory plugin", PLUGIN_FIXTURES[:memory][:code], PLUGIN_FIXTURES[:memory][:sig])
       scout(@client.key)
       #puts YAML.load(File.read(PATH_TO_DATA_FILE))['memory'].to_yaml
-
-      $continue_streaming = true # so the streamer will start running
       # for debugging, make last arg Logger.new(STDOUT)
-      streamer=Scout::Streamer.new("http://none", "bogus_client_key", PATH_TO_DATA_FILE, [plugin.id], "bogus_streaming_key",nil)
-      res = Pusher::Channel.streamer_data # Pusher::Channel.streamer_data via the mock_pusher call
-      assert_equal 3, res[:plugins][0][:fields][:v], "after the two streamer runs, this plugin should report v=3 -- it increments each run"
+      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[plugin.id],nil)
     end
+
+    streams = Pusher::Channel.streamer_data  # set by the mock_pusher call
+    assert streams.is_a?(Array)
+    assert_equal 3, streams.size
+    res=streams.last
+    assert_equal 3, res[:plugins][0][:fields][:v], "after the two streamer runs, this plugin should report v=3 -- it increments each run"
   end
 
+  def test_new_plugin_instance_every_streamer_run
+    mock_pusher(2) do
+      plugin = create_plugin(@client, "caching plugin", PLUGIN_FIXTURES[:caching][:code], PLUGIN_FIXTURES[:caching][:sig])
+      scout(@client.key)
+      # for debugging, make last arg Logger.new(STDOUT)
+      Scout::Streamer.new(PATH_TO_DATA_FILE,"bogus_streaming_key","a","b","c",[plugin.id],nil)
+    end
+
+    streams = Pusher::Channel.streamer_data  # set by the mock_pusher call
+    assert streams.is_a?(Array)
+    assert_equal 2, streams.size
+
+    # the plugin sets :v to be the current time, and caches it in a class variable. we're checking that they are NOT equal
+    assert_in_delta Time.now.to_i, streams.last[:plugins][0][:fields][:v], 5, "should be within a few seconds of now"
+    assert_in_delta Time.now.to_i, streams.first[:plugins][0][:fields][:v], 5, "should be within a few seconds of now"
+    assert_not_equal streams.first[:plugins][0][:fields][:v], streams.last[:plugins][0][:fields][:v]
+  end
 
   ######################
   ### Helper Methods ###
@@ -612,10 +640,13 @@ mybar=100
       def trigger!(event_name, data, socket=nil)
         @num_run_for_tests = @num_run_for_tests ? @num_run_for_tests+1 : 1
         # puts "in mock pusher trigger! This is run #{@num_run_for_tests} of #{$num_runs_for_mock_pusher}"
-        @@streamer_data = data
+        @@streamer_data_temp ||= Array.new
+        @@streamer_data_temp << data
         if @num_run_for_tests >= $num_runs_for_mock_pusher
-          $continue_streaming=false
+          Scout::Streamer.continue_streaming=false
           @num_run_for_tests=nil
+          @@streamer_data = @@streamer_data_temp.clone
+          @@streamer_data_temp = nil
         end
       end
     end
@@ -656,6 +687,16 @@ HXu5TIQLJ/+IYHIG2E5FWcbfddR8cmJkIl4zGs93IatQNTENksRzphob7Cz8
 wBwOHDG78kJ4TWEV5NIa5rLW8y2ltthfEPCTnS8/Zxa6h0qFtNrUWiU2KKtp
 xTbJ3RgWKUnAR3YrEGB/JjjkPN2FrsDRvlClGujaYIWpWGkf+GZcpUn+QYxP
 w7/kFz29Ds4hJRg2E2cWCHPtrD4dI0p/1iwP4XsxOw==
+EOS
+      },
+      :caching=>{:code=>"class CachingPlugin < Scout::Plugin;def build_report; @v||= Time.now.to_i; report(:v=>@v);end;end",
+                 :sig=><<EOS
+zcEUdxS9h/iD/xYK1SbvTn2mi0vJzfgIkmrouzXeRbEsbcKTdOhc3nOBwUH5
+SEOvQnPKmTiN7qaRiDZJypB/ldKxG4PL8zI0kL5G3AUZcxJBfqWe82jCKpyY
+I49DWaBW4tZWM3j5T64+60ifPlKVXQMLVIYQtPTpVDMnftzfokDbBYsEhB2e
+gNnsaAL5Nar+JE2GqM7nh79IgfXOrrYLdsv4zUJfex/OrKJS53ZCRnDcvlXu
+pKFiS6IF2dJkIFlnNlYaXK5ZSXGANGY80Ji4ivz077JpuogQzrVkqHk13A1G
+dGvCQOmVn51PKtmDm5DbfZaw4j4w+1pO2+G9Qm1y+A==
 EOS
       }
   } # end of PLUGIN_FIXTURES

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.4.6.alpha
-  prerelease: 6
+  version: 5.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Andre Lewis
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-17 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elif
-  requirement: &70103547353160 !ruby/object:Gem::Requirement
+  requirement: &70362600075880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70103547353160
+  version_requirements: *70362600075880
 description: ! 'Scout makes monitoring and reporting on your web applications as flexible
   and simple as possible.
 
@@ -50,7 +50,6 @@ files:
 - lib/scout/command/install.rb
 - lib/scout/command/run.rb
 - lib/scout/command/sign.rb
-- lib/scout/command/stream.rb
 - lib/scout/command/test.rb
 - lib/scout/command/troubleshoot.rb
 - lib/scout/daemon_spawn.rb
@@ -60,7 +59,7 @@ files:
 - lib/scout/server.rb
 - lib/scout/server_base.rb
 - lib/scout/streamer.rb
-- lib/scout/streamer_control.rb
+- lib/scout/streamer_daemon.rb
 - lib/scout/version.rb
 - scout.gemspec
 - test/plugins/disk_usage.rb
@@ -208,7 +207,6 @@ files:
 - vendor/signature/.document
 - vendor/signature/.gitignore
 - vendor/signature/Gemfile
-- vendor/signature/Gemfile.lock
 - vendor/signature/LICENSE
 - vendor/signature/README.md
 - vendor/signature/Rakefile
@@ -234,9 +232,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: scout
 rubygems_version: 1.8.10

data/lib/scout/command/stream.rb

@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby -wKU
-
-require "logger"
-
-module Scout
-  class Command
-    class Stream < Command
-      PID_FILENAME="streamer.pid"
-
-      def run
-        @key = @args[0]
-        daemon_command = @args[1]
-        @plugin_ids = @options[:plugin_ids]
-
-        if !@key
-          puts "usage: scout stream [your_scout_key] [start|stop]"
-          exit(1)
-        end
-
-        # server and history methods are inherited from Scout::Command base class
-        streamer_log_file=File.join(File.dirname(history),"scout_streamer.log")
-        streamer_pid_file=File.join(File.dirname(history),"scout_streamer.pid")
-
-        streamer_control_options = {:log_file => streamer_log_file,
-                                    :pid_file => streamer_pid_file,
-                                    :sync_log => true,
-                                    :working_dir => File.dirname(history)}
-
-        # we use STDOUT for the logger because daemon_spawn directs STDOUT to a log file
-        streamer_control_args = [server, @key, history, @plugin_ids, @options[:streaming_key],Logger.new(STDOUT)]
-
-        if daemon_command.include? "start" # can be 'start' or 'restart'
-          if File.exists?(streamer_pid_file)
-            puts("PID file existed. Restarting ...") if $stdin.tty?
-            Scout::StreamerControl.restart(streamer_control_options,streamer_control_args)
-          else
-            puts("Starting ... ") if $stdin.tty?
-            Scout::StreamerControl.start(streamer_control_options,streamer_control_args)
-          end
-        elsif daemon_command == "stop"
-          puts("Stopping ...") if $stdin.tty?
-          Scout::StreamerControl.stop(streamer_control_options,[])
-        else
-          puts "usage: scout stream [your_scout_key] [start|stop]"
-          exit(1)
-        end
-      end
-    end
-  end
-end

data/lib/scout/streamer_control.rb

@@ -1,43 +0,0 @@
-module Scout
-  class StreamerControl < DaemonSpawn::Base
-
-    # args are: server, key, history, plugin_ids, streaming_key, log
-    def start(args)
-      #puts "StreamerControl#start PID=#{pid}"
-      server,key,history,plugin_ids,streaming_key,log = args
-      $continue_streaming = true #needed for streamer to loop
-
-      @scout = Scout::Streamer.new(server, key, history, plugin_ids, streaming_key, log)
-      # puts "StreamerControl - done. Removing pid_file at #{pid_file} containing PID=#{pid}"
-      File.unlink(pid_file) if File.exists?(pid_file) # a better way of doing this?
-    end
-
-    def stop
-      $continue_streaming = false
-    end
-  end
-end
-
-
-# This is how to start using this file as a start/stop command processor, and passing arguments in via command line:
-# Since there's no second argument to StreamerControl.spawn!, it uses command-line arguments.
-#Scout::StreamerControl.spawn!({:log_file => File.expand_path('~/.scout/scout_streamer.log'),
-#                :pid_file => File.expand_path('~/.scout/scout_streamer.pid'),
-#                :sync_log => true,
-#                :working_dir => File.dirname(__FILE__)})
-
-
-# This is how you start it from anywhere in code:
-# Since there's a second argument to StreamerControl.spawn!, it uses those instead of command-line arguments.
-#Scout::StreamerControl.start({:log_file => File.expand_path('~/.scout/scout_streamer.log'),
-#                :pid_file => File.expand_path('~/.scout/scout_streamer.pid'),
-#                :sync_log => true,
-#                :working_dir => File.dirname(__FILE__)},
-#                ["ServerInstance", "abcd-1234-123g2-12321", "~/.scout/history.yml",[1,2,3,4],nil])
-
-# This is how you stop in anywhere in code:
-# Since there's a second argument to StreamerControl.spawn!, it uses those instead of command-line arguments.
-#Scout::StreamerControl.stop({:log_file => File.expand_path('~/.scout/scout_streamer.log'),
-#                :pid_file => File.expand_path('~/.scout/scout_streamer.pid'),
-#                :sync_log => true,
-#                :working_dir => File.dirname(__FILE__)},[])