nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add more output (swapping), increase swapfile size

Browse source 
MY FIRST COMMIT <3 (it would be so awesome if this would make travis green)
:P
This commit is contained in:
Florian Staudacher 2012-04-06 01:16:37 +02:00
parent 0850d5147f
commit 248e9d9ae7
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/ci/before.sh
View file

@ -14,7 +14,7 @@ sh -e /etc/init.d/xvfb start
# setup swapfile # setup swapfile
echo "creating a swapfile" echo "creating a swapfile"
sudo dd if=/dev/zero of=swapfile bs=1M count=64 sudo dd if=/dev/zero of=swapfile bs=1M count=128
sudo mkswap swapfile sudo mkswap swapfile
sudo swapon swapfile sudo swapon swapfile

12
spec/support/deferred_garbage_collection.rb
View file

@ -12,9 +12,9 @@ class DeferredGarbageCollection
end end
def self.memory_threshold def self.memory_threshold
mem = %x(free 2>/dev/null).to_s.split(" ") @mem = %x(free 2>/dev/null).to_s.split(" ")
return nil if mem.empty? return nil if @mem.empty?
mem[8].to_i / (mem[7].to_i/100) @mem[8].to_i / (@mem[7].to_i/100)
end end
def self.reconsider def self.reconsider
@ -22,7 +22,11 @@ class DeferredGarbageCollection
if (percent_used = self.memory_threshold) if (percent_used = self.memory_threshold)
running_out_of_memory = percent_used > 90 running_out_of_memory = percent_used > 90
puts "percent memory used #{percent_used}" # just for info, as soon as we got some numbers remove it
# just for info, as soon as we got some numbers remove it
swap_percent_used = @mem[19].to_i / (@mem[18].to_i/100) rescue 0
puts "percent memory used #{percent_used} (#{@mem[8]} of #{@mem[7]})"
puts "percent swap used #{swap_percent_used} (#{@mem[19]} of #{@mem[18]})"
else else
running_out_of_memory = false running_out_of_memory = false
end end