scout 5.6.10 → 5.6.11

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 5.6.11
+
+* Remove the scout_streamer.pid file after the realtime processes has expired.
+
 # 5.6.10
 
 * Fix for plugin.properties that contain '=' in the property value

data/lib/scout/streamer.rb

@@ -93,6 +93,10 @@ module Scout
       end
 
       info("Streamer PID=#{$$} ending.")
+
+      # remove the pid file before exiting
+      streamer_pid_file=File.join(File.dirname(history_file),"scout_streamer.pid")
+      File.unlink(streamer_pid_file) if File.exist?(streamer_pid_file)
     end
 
     

data/lib/scout/streamer_daemon.rb

@@ -49,7 +49,7 @@ module Scout
       @scout = Scout::Streamer.new(history, streaming_key, p_app_id, p_key, p_secret, plugin_ids, hostname, log)
     end
 
-    # this method is called by DaemonSpawn's class start method.
+    # this method is called by DaemonSpawn's class stop method.
     def stop
       Scout::Streamer.continue_streaming = false
     end

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.6.10"
+  VERSION = "5.6.11"
 end

data/test/scout_test.rb

@@ -489,6 +489,29 @@ myurl=http://foo.com?foo=bar
     assert_nil @client.reload.streamer_command
   end
 
+  # Unfortunately, the Scout::Streamer::MAX_DURATION needs to be set in another process,
+  #   so even Scout::Streamer.const_set :MAX_DURATION, 0 doesn't work
+  # The only way to test this is to 1) open up streamer.rb and change MAX_DURATION=0, 2) uncomment this test, 3, run this test
+  #
+  #def test_streamer_removes_process_id_after_shutting_down
+  #  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,a,b,c,1,3")
+  #  exec_scout(@client.key)
+  #  assert File.exist?(streamer_pid_file)
+  #  process_id = File.read(streamer_pid_file).to_i
+  #  assert process_running?(process_id)
+  #
+  #  sleep 2
+  #
+  #  assert !process_running?(process_id)
+  #  assert !File.exist?(streamer_pid_file)
+  #end
+
+
   def test_streamer_with_memory
     mock_pusher(3) do
       plugin = create_plugin(@client, "memory plugin", PLUGIN_FIXTURES[:memory][:code], PLUGIN_FIXTURES[:memory][:sig])

metadata

@@ -1,50 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scout
-version: !ruby/object:Gem::Version 
-  hash: 59
+version: !ruby/object:Gem::Version
+  version: 5.6.11
   prerelease: 
-  segments: 
-  - 5
-  - 6
-  - 10
-  version: 5.6.10
 platform: ruby
-authors: 
+authors:
 - Andre Lewis
 - Derek Haynes
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-31 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: elif
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: |
-  The scout gem reports metrics to scoutapp.com, an easy-to-use hosted server monitoring service.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'The scout gem reports metrics to scoutapp.com, an easy-to-use hosted
+  server monitoring service.
 
+'
 email: support@scoutapp.com
-executables: 
+executables:
 - scout
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.markdown
 - Gemfile
@@ -221,40 +215,32 @@ files:
 - vendor/signature/spec/signature_spec.rb
 - vendor/signature/spec/spec_helper.rb
 - vendor/util/lib/core_extensions.rb
-has_rdoc: true
 homepage: http://scoutapp.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: scout
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby gem reports metrics to our service. The agent runs plugins, configured via the Scout web interface, to monitor a server.
-test_files: 
+summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby
+  gem reports metrics to our service. The agent runs plugins, configured via the Scout
+  web interface, to monitor a server.
+test_files:
 - test/plugins/disk_usage.rb
 - test/scout_test.rb