Moved DJ back into newrelic_rpm

lyahdav · Feb 6, 2010 · dc47d38 · dc47d38
1 parent 5fe0d26
commit dc47d38
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 207 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+* Version 1.0.1
+
+  Removed DelayedJob, put back in core agent
+
 * Version 1.0.0
 
   Initial Release:

diff --git a/lib/rpm_contrib/instrumentation/delayed_job_instrumentation.rb b/lib/rpm_contrib/instrumentation/delayed_job_instrumentation.rb
diff --git a/lib/rpm_contrib/samplers/delayed_job_lock_sampler.rb b/lib/rpm_contrib/samplers/delayed_job_lock_sampler.rb
diff --git a/rpm_contrib.gemspec b/rpm_contrib.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rpm_contrib}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser"]
-  s.date = %q{2010-01-28}
+  s.date = %q{2010-02-05}
   s.description = %q{      Community contributed instrumentation for various frameworks based on
       the New Relic Ruby monitoring gem newrelic_rpm.
 }
@@ -26,11 +26,9 @@ Gem::Specification.new do |s|
      "lib/rpm_contrib.rb",
      "lib/rpm_contrib/instrumentation/authlogic.rb",
      "lib/rpm_contrib/instrumentation/camping.rb",
-     "lib/rpm_contrib/instrumentation/delayed_job_instrumentation.rb",
      "lib/rpm_contrib/instrumentation/paperclip.rb",
-     "lib/rpm_contrib/samplers/delayed_job_lock_sampler.rb",
-     "test/delayed_job_instrumentation/delayed_job_test.rb",
      "test/helper.rb",
+     "test/schema.rb",
      "test/test_rpm_contrib.rb"
   ]
   s.homepage = %q{http://github.com/newrelic/rpm_contrib}
@@ -39,8 +37,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Contributed Instrumentation for New Relic RPM}
   s.test_files = [
-    "test/delayed_job_instrumentation/delayed_job_test.rb",
-     "test/helper.rb",
+    "test/helper.rb",
+     "test/schema.rb",
      "test/test_rpm_contrib.rb"
   ]
 

diff --git a/test/delayed_job_instrumentation/test_delayed_job.rb b/test/delayed_job_instrumentation/test_delayed_job.rb
diff --git a/test/schema.rb b/test/schema.rb
@@ -10,18 +10,6 @@
 
   ActiveRecord::Schema.define do
 
-    create_table :delayed_jobs, :force => true do |table|
-      table.integer  :priority, :default => 0
-      table.integer  :attempts, :default => 0
-      table.text     :handler
-      table.string   :last_error
-      table.datetime :run_at
-      table.datetime :locked_at
-      table.string   :locked_by
-      table.datetime :failed_at
-      table.timestamps
-    end
-
     create_table :stories, :force => true do |table|
       table.string :text
     end