@@ -2,22 +2,12 @@ class AdminController < ApplicationController
def index
require_auth 'admin'
- @bugs = Bug.find(:all)
- @errors = @bugs.select{|bug| bug.level == Bug::ERROR and bug.status == Bug::NEW}
- @warnings = @bugs.select{|bug| bug.level == Bug::WARNING and bug.status == Bug::NEW}
-
- @percent_error = (@errors.size * 100.0) / @bugs.size
- @percent_warning = (@warnings.size * 100.0) / @bugs.size
- @percent_working = 100.0 - (@percent_warning + @percent_error)
-
@pingers = Ping.find(:all)
end
def feeds
require_auth 'admin'
- @feeds, @page = Feed.paginate(:all,
- :include => [:bugs],
- :page => params[:page])
+ @feeds, @page = Feed.paginate(:all, :page => params[:page])
@nb_pages = Feed.count
end
@@ -27,27 +17,13 @@ class AdminController < ApplicationController
condition = ["feeds.href LIKE ? OR feeds.title LIKE ? OR feeds.link LIKE ?", search, search, search]
@feeds, @page = Feed.paginate(:all,
- :include => [:bugs],
:conditions => condition,
:page => params[:page])
@nb_pages = Feed.find(:all,
:conditions => condition).size
render :action => 'feeds'
end
-
- def bogus_feeds
- require_auth 'admin'
- condition = ["is_bogus = 1 or is_warning = 1"]
- @feeds, @page = Feed.paginate(:all,
- :include => [:bugs],
- :conditions => condition,
- :page => params[:page])
- @nb_pages = Feed.find(:all,
- :include => [:bugs],
- :conditions => condition).size
- render :action => 'feeds'
- end
-
+
def feed_repair
require_auth 'admin'
@feeds = Feed.find(:all)
@@ -58,7 +34,7 @@ class AdminController < ApplicationController
def edit_feed
require_auth 'admin'
- @feed = Feed.find params[:id], :include => [:bugs]
+ @feed = Feed.find params[:id]
if request.post?
@feed.update_attributes params[:feed]
end
@@ -98,15 +74,12 @@ class AdminController < ApplicationController
@posts.each do |post|
# get post base url
base_url = post.url.slice(/^(http:\/\/).[^\/]*/)
- logger.debug "base_url: #{base_url}"
unless base_url.nil?
if @similars.has_key?(base_url)
if not @similars[base_url].include?(post.feed_id)
- logger.debug "adding to array#{@similars[base_url].size}: #{post.feed_id}"
@similars[base_url] << post.feed_id
end
else
- logger.debug "creating new array: #{post.feed_id}"
@similars[base_url] = [post.feed_id]
end
end
@@ -139,8 +112,6 @@ class AdminController < ApplicationController
@feed.update_attribute 'link', params[:feed][:link]
# update title if nil
@feed.fix_with_rss
- # resolve bugs
- Bug.resolve_feed(@feed)
redirect_to :action => 'feed_repair'
end
@@ -152,8 +123,6 @@ class AdminController < ApplicationController
feed.update_attribute 'link', feed.href
# update title if nil
feed.fix_with_rss
- # resolve bugs
- Bug.resolve_feed(feed)
end
redirect_to :action => 'feed_repair'
end
@@ -175,12 +144,4 @@ class AdminController < ApplicationController
@feed.destroy
end
end
-
- def no_more_bogus
- require_auth 'admin'
- @headers["Content-Type"] = "text/javascript"
- @feed = Feed.find params[:id]
- # resolve bugs
- Bug.resolve_feed(@feed)
- end
end
\ No newline at end of file
app/controllers/admin_controller.rb
@@ -170,7 +170,6 @@ class ManageController < ApplicationController
@headers["Content-Type"] = "text/javascript"
subscription = Subscription.find(params[:id])
@deleted_blog = "blog_" << params[:id]
- @deleted_bogus = "bogus_" << params[:id] if subscription.feed.is_bogus?
subscription.destroy
end
app/controllers/manage_controller.rb
@@ -11,7 +11,6 @@ class Feed < ActiveRecord::Base
has_many :subscriptions
has_many :users, :through => :subscriptions
- has_many :bugs
has_many :posts, :order => 'created_at DESC'
has_one :latest_post, :class_name => 'Post', :order => 'id DESC'
belongs_to :avatar
@@ -22,14 +21,7 @@ class Feed < ActiveRecord::Base
# Discover avatar.txt file to update avatar
def Feed.update_avatars
- Feed.find(:all).each { |feed|
- unless feed.is_bogus?
- logger.info "+++ Refresh avatar: #{feed.href}"
- feed.discover_avatar_txt
- else
- logger.info "--- Not refreshing avatar: #{feed.href}"
- end
- }
+ Feed.find(:all).each { |feed| feed.discover_avatar_txt }
end
def Feed.create_from_blog(input_url)
@@ -127,39 +119,24 @@ class Feed < ActiveRecord::Base
end
def refresh(forced=false)
- unless is_bogus?
- begin
- # Get first item
- Timeout::timeout(30) do
- entry = Rfeedreader.read_first(link).entries[0]
-
- if !entry.nil? and !entry.link.nil? and (forced or latest_post.nil? or entry.link != latest_post.url)
- # Save new post
- Post.create(:url => entry.link,
- :title => entry.title,
- :description => entry.description,
- :feed_id => id)
- end
+ begin
+ # Get first item
+ Timeout::timeout(30) do
+ entry = Rfeedreader.read_first(link).entries[0]
+
+ if !entry.nil? and !entry.link.nil? and (forced or latest_post.nil? or entry.link != latest_post.url)
+ # Save new post
+ Post.create(:url => entry.link,
+ :title => entry.title,
+ :description => entry.description,
+ :feed_id => id)
end
- rescue Timeout::Error
- Bug.raise_feed_bug(self, "timeout", Bug::WARNING)
- rescue => err
- Bug.raise_feed_bug(self, err) unless self.is_bogus?
end
+ rescue Timeout::Error
+ rescue => err
end
end
- def has_error
- return self.is_bogus == 1 ? true : false
- end
-
- alias is_bogus? has_error
- alias bogus has_error
-
- def has_warnings
- return self.is_warning == 1 ? true : false
- end
-
# Return the rss item link
def read_link(item)
link = item.search("link:first")
@@ -240,7 +217,6 @@ class Feed < ActiveRecord::Base
return file
rescue => error
- Bug.raise_feed_bug(self, error, Bug::WARNING)
return nil
end
end
@@ -257,7 +233,6 @@ class Feed < ActiveRecord::Base
:href => rss.channel.link
end
rescue => err
- Bug.raise_feed_bug(self, err)
end
end
@@ -398,7 +373,6 @@ class Feed < ActiveRecord::Base
private
def destroy_relationship
- Bug.destroy_all "feed_id = #{self.id}"
Post.destroy_all "feed_id = #{self.id}"
Subscription.destroy_all "feed_id = #{self.id}"
end
app/models/feed.rb
@@ -71,7 +71,7 @@ class User < ActiveRecord::Base
end
subscriptions.each do |subscription|
feed = subscription.feed
- if !feed.nil? and !feed.is_bogus? then
+ if !feed.nil? then
#post = Post.from_google_api(feed) unless feed.link.nil?
post = feed.latest_post
unless post.nil? or post.created_at.nil?
app/models/user.rb
@@ -1,15 +1,11 @@
<% unless feed_row.nil? -%>
-<tr id='row_<%= feed_row.id %>' class="bogus_<%= feed_row.bogus %>">
+<tr id='row_<%= feed_row.id %>'>
<td><%= feed_row.id %></td>
<td><%= "<a href='#{feed_row.href}'>#{truncate(feed_row.title, 50)}</a>" %></td>
<td><%= "<a href='#{feed_row.link}'>#{truncate(feed_row.link, 50)}</a>" %></td>
<td>
<%= link_to 'Edit', {:action => 'edit_feed', :id => feed_row.id} %><br/>
<%= link_to_remote 'Delete', {:url => {:action => 'delete_feed', :id => feed_row.id}} %>
- <% if feed_row.bogus -%>
- <br/>
- <%= link_to_remote "No more bogus", :url => {:action => 'no_more_bogus', :id => feed_row.id} %>
- <% end -%>
</td>
</tr>
<% end -%>
\ No newline at end of file
app/views/admin/_feed_row.rhtml
@@ -1,16 +1,3 @@
-<h1>Status</h1>
-Warning: <%= @warnings.size %><br/>
-Errors: <%= @errors.size %><br/>
-<table border="0" cellspacing="0" cellpadding="0" style='width:800px;'>
- <tr>
- <% unless @percent_working < 1 %>
- <td style='width:<%= @percent_working %>%;background-color:#DFD;color:#060;height:20px;'></td>
- <% end %>
- <td style='width:<%= @percent_warning %>%;background-color:#CAA;color:#300;height:20px;'></td>
- <td style='width:<%= @percent_error %>%;background-color:#933;color:#600;height:20px;'></td>
- </tr>
-</table>
-
<h1>Feeds</h1>
<form action='/admin/search_feed' method='post'>
<input type="text" name="search" value="" id="search"><input type="submit" value="Search »" id="some_name">
@@ -18,7 +5,6 @@ Errors: <%= @errors.size %><br/>
<br/>
<ul>
<li><%= link_to "Display all feeds", :action => "feeds" %></li>
- <li><%= link_to "Display bogus feeds", :action => "bogus_feeds" %></li>
<li><%= link_to "Repair feeds", :action => "feed_repair" %></li>
<li><%= link_to "Remove duplicates", :action => "remove_duplicate_feeds" %></li>
</ul>
app/views/admin/index.rhtml
@@ -1,7 +1,6 @@
<!-- show blog -->
<% feed = subscription.feed %>
<% unless feed.nil? %>
-<% if !feed.is_bogus? %>
<div id="blog_<%= subscription.id %>" class="caja1">
<!-- caja redondeada negra -->
<div class="xsnazzy">
@@ -31,42 +30,4 @@
<!-- end caja redondeada -->
</div>
<!-- end caja! -->
-<% else %>
-<div id="bogus_<%= subscription.id %>" class='bogus_message'>
- <h1>This blog is not working :-(</h1>
- <p>The feed seems to be broken</p>
- <p>Feevy team is working on it</p>
-</div>
-<!-- show blog -->
-<div id="blog_<%= subscription.id %>" class="caja1">
- <!-- caja redondeada negra -->
- <div class="bogus_feed">
- <b class="bogus_top"><b class="bogus_1"></b><b class="bogus_2"></b><b class="bogus_3"></b><b class="bogus_4"></b></b>
- <div class="bogus_content">
- <!-- capa contenedora -->
- <div class="show_blog">
- <br/>
- <% if feed.avatar_locked == 1 %>
- <img src='<%= feed.avatar.url %>' alt='current avatar' style='float:left;padding-right:5px;'/>
- <% else %>
- <img src='<%= subscription.avatar.url %>' alt='current avatar' style='float:left;padding-right:5px;'/>
- <% end %>
- <h3><%= "#{index}. #{feed.title}" %></h3>
- <h5><%= truncate(feed.href, 50) %></h5>
- <p>tags: <span id='tag_list_<%= subscription.id %>' class='tag_list'><%= subscription.tag_list %> <%= link_to_remote "edit tags", {:url => {:action => "tag_blog", :id => subscription.id }} %></span></p>
- <div id="blog_control_<%= subscription.id %>" class='right'>
- <%= link_to_remote "tag", {:url => {:action => "tag_blog", :id => subscription.id }} %>
- <%= link_to_remote("change avatar", {:url => {:action => "edit_blog", :id => subscription.id }}) unless feed.avatar_locked == 1 %>
- <%= link_to_remote "delete", {:url => {:action => "delete_blog", :id => subscription.id }} %>
- </div>
- <br/>
- </div>
- <br/>
- </div>
- <b class="bogus_bottom"><b class="bogus_4"></b><b class="bogus_3"></b><b class="bogus_2"></b><b class="bogus_1"></b></b>
- </div>
- <!-- end caja redondeada -->
-</div>
-<!-- end caja! -->
-<% end %>
<% end %>
\ No newline at end of file
app/views/manage/_show_blog.rhtml
@@ -1,6 +1,4 @@
page.visual_effect :fade, "#{@deleted_blog}", :duration=>1
-page.visual_effect(:fade, "#{@deleted_bogus}", :duration=>1) unless @deleted_bogus.nil?
page.delay(1) do
page.remove "#{@deleted_blog}"
- page.remove("#{@deleted_bogus}") unless @deleted_bogus.nil?
end
\ No newline at end of file
app/views/manage/delete_blog.rjs
@@ -9,15 +9,6 @@ ActiveRecord::Schema.define(:version => 32) do
t.column "url", :string
end
- create_table "bugs", :force => true do |t|
- t.column "level", :integer
- t.column "status", :integer, :default => 0
- t.column "description", :text
- t.column "created_at", :datetime
- t.column "updated_at", :datetime
- t.column "feed_id", :integer
- end
-
create_table "cached_feeds", :force => true do |t|
t.column "href", :string
t.column "title", :string
db/schema.rb
@@ -868,50 +868,6 @@ width:400px;
color: #FFF;
}
-
-
-/**
-* Bogus blog display
-**/
-
-.bogus_feed h1, .bogus_feed h2, .bogus_feed p { margin: 0 10px }
-.bogus_feed h1 { font-size: 2.5em; color: #ffffff; }
-.bogus_feed h2 { font-size: 1em; color: #ffffff; border: 0; }
-.bogus_feed p { font:11px Helvetica, Arial, Sans-Serif; color: #cccccc;padding-bottom: 0.5em; }
-.bogus_feed h2 { padding-top: 0.5em; }
-.bogus_feed h5 {margin:0 0 10px 0; color: #ccc;}
-.bogus_feed h4 { font-size: 20px; color: #ccc; float: left; margin:0; margin-right: 5px;}
-.bogus_feed h3 {margin: 0}
-.bogus_feed a {color: #ccc;}
-.bogus_feed { background: transparent; margin: 1em; }
-
-.bogus_top, .bogus_bottom {display:block; background:transparent; font-size:1px;}
-.bogus_1, .bogus_2, .bogus_3, .bogus_4 {display:block; overflow:hidden;}
-.bogus_1, .bogus_2, .bogus_3 {height:1px;}
-.bogus_2, .bogus_3, .bogus_4 {background:#8F1E19; border-left:2px solid #8F1E19; border-right:2px solid #8F1E19;}
-.bogus_1 {margin:0 5px; background:#8F1E19;}
-.bogus_2 {margin:0 3px; border-width:0 10px;}
-.bogus_3 {margin:0 2px;}
-.bogus_4 {height:2px; margin:0 1px;}
-.bogus_content { display: table;display:block; background:#8F1E19; border:0 solid #8F1E19; border-width:0 2px;}
-
-.bogus_message{
- float:left;
- position:relative;
- top:30px;
- left:-180px;
- height:0px;
- text-align:right;
-}
-
-.bogus_message h1{
- font-size:16px;
-}
-
-.bogus_message p{
- font-size:12px;
- color:#CCC;
-}
/*CAMBIOS*/
.navenlace {
public/stylesheets/style.css
@@ -12,11 +12,10 @@ while true
@feeds[@offset, @range].each {|feed|
begin
Timeout::timeout(@timeout) {
- feed.refresh(true) unless feed.bogus == true
+ feed.refresh(true)
}
rescue Timeout::Error
unless feed.nil?
- feed.raise_bug("timeout", Bug::WARNING)
puts "Timeout on feed ##{feed.id}: #{feed.link}"
end
end
script/update_feeds
app/controllers/bug_controller.rb
app/helpers/bug_helper.rb
app/models/bug.rb
app/models/error_notifier.rb
app/views/admin/_bug_row.rhtml
app/views/bug/_bogus_feed.rhtml
app/views/bug/bogus_resolve.rjs
app/views/bug/bogus_test.rjs
app/views/bug/index.rhtml
test/fixtures/bugs.yml
test/functional/bug_controller_test.rb
test/unit/bug_test.rb
65111fe0f9cf1604a898e824703dd838b3b470ad
Alexandre Girard
alx.girard@gmail.com
http://github.com/alx/feevy/commit/9da12264bfa815d317e46d7f54f94881d62d0286
9da12264bfa815d317e46d7f54f94881d62d0286
2008-06-18T14:05:44-07:00
2008-06-18T14:05:44-07:00
Remove bug monitoring
86f2119b70bcc28c4aece29bca8b0c33eb172852
Alexandre Girard
alx.girard@gmail.com