NCCU 上傳版本 0709

Merge branch 'nccu0621'

Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb

app/jobs/nccu_calendar.rb

@@ -16,6 +16,6 @@ end
 
    # FileUtils.mv(temp_file, File.join(Rails.root, 'public/static', 'nccu_calendar.xml'))
 
-    puts "NccuCalendar Synced4"
+    puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]NccuCalendar Synced"
   end
 end

app/jobs/sync_db.rb

@@ -3,6 +3,7 @@ class SyncDb
   @queue = :high
 
   def self.perform()
+    puts "[ #{DateTime.now.strftime("%Y %D %H:%M") }]\t SyncDb Starting"
     self.start_sync
     self.set_admin
   end
@@ -12,13 +13,13 @@ class SyncDb
     args = []
     %x[rake #{task} --trace  >> #{Rails.root}/log/rake.log]
     User.all.each{|ur| ur.create_dept_cache}
-    puts "SyncDb Synced"
+    puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]\tSyncDb Synced"
   end
 
     def self.set_admin
     task = 'mid_site:install_admin'
     args = []
     %x[rake #{task} --trace  >> #{Rails.root}/log/rake.log]
-    puts "Admin done"
+    puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]\tAdmin done"
   end
 end