From 902c40e42d887e01403740bfea68ab1f65e5ee32 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Mon, 29 Aug 2011 17:23:09 -0700 Subject: [PATCH] removed the pod_stats table (was the cause of bloat on the database). --- app/models/job/http_multi.rb | 3 --- app/models/pod.rb | 13 ---------- app/models/pod_stat.rb | 4 ---- .../20110830000140_remove_pod_stats_table.rb | 24 +++++++++++++++++++ db/schema.rb | 18 +------------- spec/models/pod_spec.rb | 19 --------------- spec/models/pod_stat_spec.rb | 5 ---- 7 files changed, 25 insertions(+), 61 deletions(-) delete mode 100644 app/models/pod.rb delete mode 100644 app/models/pod_stat.rb create mode 100644 db/migrate/20110830000140_remove_pod_stats_table.rb delete mode 100644 spec/models/pod_spec.rb delete mode 100644 spec/models/pod_stat_spec.rb diff --git a/app/models/job/http_multi.rb b/app/models/job/http_multi.rb index 5bdeac98a..7db68d1fd 100644 --- a/app/models/job/http_multi.rb +++ b/app/models/job/http_multi.rb @@ -48,10 +48,7 @@ module Job end end unless response.success? - pod = Pod.find_or_create_by_url(response.effective_url) log_line = "event=http_multi_fail sender_id=#{user_id} recipient_id=#{person.id} url=#{response.effective_url} response_code='#{response.code}'" - Rails.logger.info(log_line) - pod.pod_stats.create(:error_message => log_line, :person_id => person.id, :error_code => response.code.to_i) failed_request_people << person.id end end diff --git a/app/models/pod.rb b/app/models/pod.rb deleted file mode 100644 index bd66a5630..000000000 --- a/app/models/pod.rb +++ /dev/null @@ -1,13 +0,0 @@ -class Pod < ActiveRecord::Base - has_many :pod_stats - - def self.find_or_create_by_url(url) - u = URI.parse(url) - pod = self.find_or_initialize_by_host(u.host) - unless pod.persisted? - pod.ssl = (u.scheme == 'https')? true : false - pod.save - end - pod - end -end diff --git a/app/models/pod_stat.rb b/app/models/pod_stat.rb deleted file mode 100644 index 5452d1f0a..000000000 --- a/app/models/pod_stat.rb +++ /dev/null @@ -1,4 +0,0 @@ -class PodStat < ActiveRecord::Base - belongs_to :pod - -end diff --git a/db/migrate/20110830000140_remove_pod_stats_table.rb b/db/migrate/20110830000140_remove_pod_stats_table.rb new file mode 100644 index 000000000..4bc146fa1 --- /dev/null +++ b/db/migrate/20110830000140_remove_pod_stats_table.rb @@ -0,0 +1,24 @@ +class RemovePodStatsTable < ActiveRecord::Migration + def self.up + drop_table :pods + drop_table :pod_stats + end + + def self.down + create_table :pods do |t| + t.string :host + t.boolean :ssl + + t.timestamps + end + + create_table :pod_stats do |t| + t.integer :error_code + t.integer :person_id + t.text :error_message + t.integer :pod_id + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 5f7edde5f..a81802c01 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20110818212541) do +ActiveRecord::Schema.define(:version => 20110830000140) do create_table "aspect_memberships", :force => true do |t| t.integer "aspect_id", :null => false @@ -236,22 +236,6 @@ ActiveRecord::Schema.define(:version => 20110818212541) do add_index "people", ["guid"], :name => "index_people_on_guid", :unique => true add_index "people", ["owner_id"], :name => "index_people_on_owner_id", :unique => true - create_table "pod_stats", :force => true do |t| - t.integer "error_code" - t.integer "person_id" - t.text "error_message" - t.integer "pod_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "pods", :force => true do |t| - t.string "host" - t.boolean "ssl" - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "post_visibilities", :force => true do |t| t.integer "post_id", :null => false t.datetime "created_at" diff --git a/spec/models/pod_spec.rb b/spec/models/pod_spec.rb deleted file mode 100644 index e6a5e63b9..000000000 --- a/spec/models/pod_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'spec_helper' - -describe Pod do - - it 'has many pod_stats' do - Pod.new.pod_stats.should be_empty - end - describe '.find_or_create_by_url' do - it 'takes a url, and makes one by host' do - pod = Pod.find_or_create_by_url('https://joindiaspora.com/maxwell') - pod.host.should == 'joindiaspora.com' - end - - it 'sets ssl boolean(side-effect)' do - pod = Pod.find_or_create_by_url('https://joindiaspora.com/maxwell') - pod.ssl.should be_true - end - end -end diff --git a/spec/models/pod_stat_spec.rb b/spec/models/pod_stat_spec.rb deleted file mode 100644 index 15bc5b2b8..000000000 --- a/spec/models/pod_stat_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'spec_helper' - -describe PodStat do - pending "add some examples to (or delete) #{__FILE__}" -end