From 424c9c94a841baae8ef6732c1f6e563a0576f9a8 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Sun, 17 Feb 2013 20:43:05 -0500
Subject: [PATCH] fixes

---
 app/logical/memorylogic.rb |  4 ++--
 config/deploy.rb           | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/logical/memorylogic.rb b/app/logical/memorylogic.rb
index fb71413e2..b2c8f8b45 100644
--- a/app/logical/memorylogic.rb
+++ b/app/logical/memorylogic.rb
@@ -5,8 +5,8 @@ module Memorylogic
 
   def self.memory_usage
     ps = Sys::ProcTable.ps(Process.pid)
-    if ps.respond_to?(:rss)
-      number_to_human_size(ps.rss.to_i * 1.kilobyte)
+    if ps.respond_to?(:pctmem)
+      ps.pctmem
     else
       0
     end
diff --git a/config/deploy.rb b/config/deploy.rb
index 562491eb6..5b9b15eb0 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -79,6 +79,19 @@ namespace :deploy do
     end
   end
   
+  namespace :nginx do
+    desc "Stop nginx"
+    task :stop do
+      sudo "/etc/init.d/nginx stop"
+      sleep 15
+    end
+    
+    desc "Start nginx"
+    task :start do
+      sudo "/etc/init.d/nginx start"
+    end
+  end
+  
   desc "Precompiles assets"
   task :precompile_assets do
     run "cd #{current_path}; bundle exec rake assets:precompile"
@@ -126,7 +139,9 @@ after "deploy:create_symlink", "data:link_directories"
 # after "deploy:stop", "delayed_job:stop"
 # after "deploy:restart", "delayed_job:restart"
 before "deploy:update", "deploy:web:disable"
+# after "deploy:update", "deploy:nginx:stop"
 after "deploy:update", "deploy:restart"
 after "deploy:restart", "deploy:precompile_assets"
 after "deploy:restart", "deploy:web:enable"
+# after "deploy:update", "deploy:nginx:start"
 # after "delayed_job:stop", "delayed_job:kill"