cafe-grader-web Commit - r175:f0e96dfc88c2

cafe-grader-web

Commit `r175:f0e96dfc88c2` public

parent | child

Description:

updated grader list page git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@375 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r175:f0e96dfc88c2 - Sun, 26 Apr 2009 13:39:48 - 5 files changed: 66 inserted, 26 deleted

app/controllers/graders_controller.rb ¶ +11 -3

               class GradersController < ApplicationController
                 before_filter :admin_authorization
-            -   verify :method => :post, :only => ['clear_all'],
+            +   verify :method => :post, :only => ['clear_all', 'clear_terminated'],
                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
-            -     @grader_processes = GraderProcess.find(:all,
+            +     @grader_processes = GraderProcess.find_running_graders
-            -                                            :order => 'updated_at desc')
                   @stalled_processes = GraderProcess.find_stalled_process
+            +
+            +     @terminated_processes = GraderProcess.find_terminated_graders
                   @last_task = Task.find(:first,
                                          :order => 'created_at DESC')
                   @last_test_request = TestRequest.find(:first,
                                                         :order => 'created_at DESC')
                 end
                 def clear
                   grader_proc = GraderProcess.find(params[:id])
                   grader_proc.destroy if grader_proc!=nil
                   redirect_to :action => 'list'
                 end
+            +   def clear_terminated
+            +     GraderProcess.find_terminated_graders.each do |p|
+            +       p.destroy
+            +     end
+            +     redirect_to :action => 'list'
+            +   end
+            +
                 def clear_all
                   GraderProcess.find(:all).each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def view
                   if params[:type]=='Task'
                     redirect_to :action => 'task', :id => params[:id]
                   else
                     redirect_to :action => 'test_request', :id => params[:id]

app/models/grader_process.rb ¶ +21 -3

                                               :host => host,
                                               :pid => pid
                                             })
                 end
                 def self.register(host,pid,mode)
                   grader = GraderProcess.find_by_host_and_pid(host,pid)
                   if grader
                     grader.mode = mode
                     grader.active = nil
                     grader.task_id = nil
                     grader.task_type = nil
+            +       grader.terminated = false
                     grader.save
                   else
                     grader = GraderProcess.create(:host => host,
                                                   :pid => pid,
-            -                                     :mode => mode)
+            +                                     :mode => mode,
+            +                                     :terminated => false)
                   end
                   grader
                 end
+            +
+            +   def self.find_running_graders
+            +     GraderProcess.find(:all,
+            +                        :conditions => {:terminated => 0})
+            +   end
-            -   def self.find_stalled_process()
+            +   def self.find_terminated_graders
                   GraderProcess.find(:all,
-            -                        :conditions => ["active AND updated_at < ?",
+            +                        :conditions => "`terminated`")
+            +   end
+            +
+            +   def self.find_stalled_process
+            +     GraderProcess.find(:all,
+            +                        :conditions => ["(`terminated` = 0) AND active AND " +
+            +                                        "(updated_at < ?)",
                                                      Time.now.gmtime - GraderProcess.stalled_time])
                 end
                 def report_active(task=nil)
                   self.active = true
                   if task!=nil
                     self.task_id = task.id
                     self.task_type = task.class.to_s
                   else
                     self.task_id = nil
                     self.task_type = nil
                   end
                 def report_inactive(task=nil)
                   self.active = false
                   if task!=nil
                     self.task_id = task.id
                     self.task_type = task.class.to_s
                   else
                     self.task_id = nil
                     self.task_type = nil
                   end
                   self.save
                 end
+            +   def terminate
+            +     self.terminated = true
+            +     self.save
+            +   end
+            +
                 protected
                 def self.stalled_time()
                   return 1.minute
                 end
               end

app/views/graders/_grader_list.html.haml ¶ +23 -17

@@ -1,18 +1,24
		1	+ - if grader_list.length!=0
		2	+ %table.graders
		3	+ %tr
		4	+ %th host
		5	+ %th pid
		6	+ %th mode
		7	+ %th last updated
		8	+ %th type
		9	+ %th task
		10	+ - grader_list.each do \|grader\|
		11	+ - if grader.active
		12	+ - c = 'active'
		13	+ - else
		14	+ - c = 'inactive'
		15	+ %tr{:class => c}
		16	+ = render :partial => 'grader', :locals => {:grader => grader}
		17	+ - if not grader.terminated
		18	+ %td= link_to 'stop', {:action => 'stop', :id => grader}
		19	+ - else
		20	+ %td= link_to 'clear', {:action => 'clear', :id => grader}
		21	+ - else
		22	+ %ul
		23	+ %li None
1		24
2	- %table.graders
3	- %tr
4	- %th host
5	- %th pid
6	- %th mode
7	- %th last updated
8	- %th type
9	- %th task
10	- - grader_list.each do \|grader\|
11	- - if grader.active
12	- - c = 'active'
13	- - else
14	- - c = 'inactive'
15	- %tr{:class => c}
16	- = render :partial => 'grader', :locals => {:grader => grader}
17	- %td= link_to 'clear', {:action => 'clear', :id => grader}
18	-

app/views/graders/list.html.haml ¶ +9 -2

               - if @last_task
                 Last task:
                 = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
                 %br/
               - if @last_test_request
                 Last test_request:
                 = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
-            - %h3 Current graders
+            + %h2 Current graders
               = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
-            - %h3 Stalled graders
+            + %h2 Stalled graders
               = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
+            +
+            + %h2 Terminated graders
+            +
+            + - form_for :clear, nil, :url => {:action => 'clear_terminated'} do |f|
+            +   = submit_tag 'Clear data for terminated graders'
+            +
+            + = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20090416235658) do
+            + ActiveRecord::Schema.define(:version => 20090426131044) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                 end
                 create_table "configurations", :force => true do |t|
                   t.datetime "updated_at"
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"
                   t.string   "task_type"
+            +     t.boolean  "terminated"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                   t.string "common_ext"
                 end
                 create_table "messages", :force => true do |t|

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r175:f0e96dfc88c2 - Sun, 26 Apr 2009 13:39:48 - 5 files changed: 66 inserted, 26 deleted

Sign in to your account

Commit r175:f0e96dfc88c2 public

Author

r175:f0e96dfc88c2 - Sun, 26 Apr 2009 13:39:48 - 5 files changed: 66 inserted, 26 deleted

Commit `r175:f0e96dfc88c2` public