ward/ripnews
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix warnings & lower memory usage

Browse source
This commit is contained in:
Ward Wouts 2004-09-01 11:25:46 +00:00
parent 76d516bd8f
commit f0f26c4b8f
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
trunk/ripnews/news/article.rb
View file

@ -1,4 +1,4 @@
# $Dwarf: article.rb,v 1.87 2004/06/07 21:47:51 ward Exp $ # $Dwarf: article.rb,v 1.88 2004/06/16 08:16:23 ward Exp $
# $Source$ # $Source$
# #
@ -29,7 +29,7 @@ class PermError < ArticleError; end
class Article class Article
Debuglevel = 2 Debuglevel = 0
def initialize(nntpservers, groupname, newsrc="~/.newsrc") def initialize(nntpservers, groupname, newsrc="~/.newsrc")
@messids = [] @messids = []
@ -62,6 +62,9 @@ end
def reconnect(server) def reconnect(server)
begin begin
@connections[server]["nntp"].quit @connections[server]["nntp"].quit
# helpt dit in geheugen gebruik? : Volgens mij niet
#@connections[server].delete("nntp")
#GC.start
rescue Errno::EPIPE, Errno::ECONNRESET, EOFError rescue Errno::EPIPE, Errno::ECONNRESET, EOFError
end end
begin begin
@ -182,6 +185,7 @@ def get_articles(cachedir=false)
end end
save_cache(cachedir, server) save_cache(cachedir, server)
end end
GC.start
end end
def get_group_info(server) def get_group_info(server)
@ -194,7 +198,7 @@ def get_group_info(server)
timeout(30) do timeout(30) do
begin begin
resp, count, first, last, name = @connections[server]["nntp"].group(@group) resp, count, first, last, name = @connections[server]["nntp"].group(@group)
rescue Net::NNTP::RuntimeError rescue Net::NNTPReplyError
printerr(server) printerr(server)
if ( $!.to_s =~ /^503|^400/ ) if ( $!.to_s =~ /^503|^400/ )
reconnect(server) reconnect(server)
@ -237,7 +241,7 @@ def get_xhdr(server, range, header)
print "got response #{resp} while reading group #{@group} from #{server}\n" print "got response #{resp} while reading group #{@group} from #{server}\n"
raise TempError raise TempError
end end
rescue Net::NNTP::RuntimeError rescue Net::NNTPReplyError
printerr(server) printerr(server)
if ( $!.to_s =~ /^503|^400/ ) if ( $!.to_s =~ /^503|^400/ )
reconnect(server) reconnect(server)
@ -295,14 +299,15 @@ end
def get_body(server, message) def get_body(server, message)
timedout = 0 timedout = 0
retries = 0
resp = "" resp = ""
id = "" id = ""
messid = "" messid = ""
list = [] list = []
retries = 0
begin begin
timeout(180) do timeout(180) do
begin begin
list = []
resp, id, messid, list = @connections[server]["nntp"].body(message) resp, id, messid, list = @connections[server]["nntp"].body(message)
rescue Net::NNTPReplyError rescue Net::NNTPReplyError
a = '' a = ''
@ -624,7 +629,8 @@ def group_subject_sort(subj)
sort_arr.push( [ sort_arr.push( [
@groups[subj]["subject"][i].dup, @groups[subj]["subject"][i].dup,
@groups[subj]["messages"][i].dup, @groups[subj]["messages"][i].dup,
@groups[subj]["ids"][i].dup, #@groups[subj]["ids"][i].dup, # eng hoor, dit wijzigen
@groups[subj]["ids"][i],
@groups[subj]["servers"][i].dup @groups[subj]["servers"][i].dup
] ) if serverhash[@groups[subj]["servers"][i]] != nil ] ) if serverhash[@groups[subj]["servers"][i]] != nil
end end