From eb3644a197caf5fc3c4df1af6f725996c363a22c Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 2 Feb 2016 19:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=B8=80=E5=A0=86=E7=9A=84rake?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=8F=98=E4=B8=BA=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/elasticsearch_batch_op.rake | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/lib/tasks/elasticsearch_batch_op.rake b/lib/tasks/elasticsearch_batch_op.rake
index 4be382367..b9933cf75 100644
--- a/lib/tasks/elasticsearch_batch_op.rake
+++ b/lib/tasks/elasticsearch_batch_op.rake
@@ -1,17 +1,11 @@
 namespace :importer do
-  task :import_all => :environment do
-    Rake::Task["importer:importuser"].execute
-    Rake::Task["importer:importproject"].execute
-    Rake::Task["importer:importcourse"].execute
-    Rake::Task["importer:importattachment"].execute
-    Rake::Task["importer:importmemo"].execute
-  end
+
   task :importuser => :environment do
     ENV['CLASS']='User'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
   task :importproject => :environment do
 
@@ -19,27 +13,30 @@ namespace :importer do
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
   task :importcourse => :environment do
     ENV['CLASS']='Course'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
   task :importattachment => :environment do
     ENV['CLASS']='Attachment'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
   task :importmemo => :environment do
     ENV['CLASS']='Memo'
     ENV['SCOPE']='indexable'
     ENV['FORCE']='y'
     ENV['BATCH']='1000'
-    Rake::Task["elasticsearch:import:model"].invoke
+    Rake::Task["elasticsearch:import:model"].execute
   end
+
+  desc "Run all tasks"
+  task :all => [:importuser,:importproject,:importcourse,:importattachment,:importmemo]
 end
\ No newline at end of file