cafe-grader-web Commit - r203:e7056be0091a

cafe-grader-web

Commit `r203:e7056be0091a` public

parent | child

Description:

added more grader control git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@434 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

r203:e7056be0091a - Fri, 27 Nov 2009 10:07:58 - 6 files changed: 81 inserted, 21 deleted

lib/grader_script.rb created 644 ¶ +35

@@ -0,0 +1,35
	1	+ module GraderScript
	2	+
	3	+ def self.grader_control_enabled?
	4	+ if defined? GRADER_SCRIPT_DIR
	5	+ GRADER_SCRIPT_DIR != ''
	6	+ else
	7	+ false
	8	+ end
	9	+ end
	10	+
	11	+ def self.stop_grader(pid)
	12	+ if GraderScript.grader_control_enabled?
	13	+ cmd = "#{GRADER_SCRIPT_DIR}/grader stop #{pid}"
	14	+ system(cmd)
	15	+ end
	16	+ end
	17	+
	18	+ def self.stop_graders(pids)
	19	+ if GraderScript.grader_control_enabled?
	20	+ pid_str = (pids.map { \|process\| process.pid.to_a }).join ' '
	21	+ cmd = "#{GRADER_SCRIPT_DIR}/grader stop " + pid_str
	22	+ system(cmd)
	23	+ end
	24	+ end
	25	+
	26	+ def self.start_grader(env)
	27	+ if GraderScript.grader_control_enabled?
	28	+ cmd = "#{GRADER_SCRIPT_DIR}/grader #{env} queue &"
	29	+ system(cmd)
	30	+ cmd = "#{GRADER_SCRIPT_DIR}/grader #{env} test_request &"
	31	+ system(cmd)
	32	+ end
	33	+ end
	34	+
	35	+ end

app/controllers/graders_controller.rb ¶ +23 -9

               class GradersController < ApplicationController
                 before_filter :admin_authorization
-            -   verify :method => :post, :only => ['clear_all', 'clear_terminated'],
+            +   verify :method => :post, :only => ['clear_all',
+            +                                      'start_exam',
+            +                                      'start_grading',
+            +                                      'stop_all',
+            +                                      'clear_terminated'],
                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @grader_processes = GraderProcess.find_running_graders
                   @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 view
                   if params[:type]=='Task'
                     redirect_to :action => 'task', :id => params[:id]
                   else
                     redirect_to :action => 'test_request', :id => params[:id]
                   end
                 end
                 def test_request
                   @test_request = TestRequest.find(params[:id])
                 end
                 def task
                   @task = Task.find(params[:id])
                 end
                 def submission
                   @submission = Submission.find(params[:id])
                 end
                 # various grader controls
                 def stop
                   grader_proc = GraderProcess.find(params[:id])
-            -     stop_grader(grader_proc.pid)
+            +     GraderScript.stop_grader(grader_proc.pid)
+            +     flash[:notice] = 'Grader stopped.  It may not disappear now, but it should disappear shortly.'
+            +     redirect_to :action => 'list'
+            +   end
+            +
+            +   def stop_all
+            +     GraderScript.stop_graders(GraderProcess.find_running_graders +
+            +                               GraderProcess.find_stalled_process)
+            +     flash[:notice] = 'Graders stopped.  They may not disappear now, but they should disappear shortly.'
                   redirect_to :action => 'list'
                 end
+            +   def start_grading
-            -   protected
+            +     GraderScript.start_grader('grading')
+            +     flash[:notice] = '2 graders in grading env started, one for grading queue tasks, another for grading test request'
+            +     redirect_to :action => 'list'
+            +   end
-            -   def stop_grader(pid)
+            +   def start_exam
-            -     if GraderProcess.grader_control_enabled?
+            +     GraderScript.start_grader('exam')
-            -       cmd = "#{GRADER_SCRIPT_DIR}/grader stop #{pid}"
+            +     flash[:notice] = '2 graders in grading env started, one for grading queue tasks, another for grading test request'
-            -       system(cmd)
+            +     redirect_to :action => 'list'
-            -     end
                 end
               end

app/models/grader_process.rb ¶ -8

                                                   :pid => pid,
                                                   :mode => mode,
                                                   :terminated => false)
                   end
                   grader
                 end
                 def self.find_running_graders
                   GraderProcess.find(:all,
                                      :conditions => {:terminated => 0})
                 end
                 def self.find_terminated_graders
                   GraderProcess.find(:all,
                                      :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 self.grader_control_enabled?
-            -     if defined? GRADER_SCRIPT_DIR
-            -       GRADER_SCRIPT_DIR != ''
-            -     else
-            -       false
-            -     end
-            -   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
                   self.save
                 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

app/views/graders/_grader_list.html.haml ¶ +1 -1

               - if grader_list.length!=0
                 %table.graders
                   %tr
                     %th host
                     %th pid
                     %th mode
                     %th last updated
                     %th type
                     %th task
                   - grader_list.each do |grader|
                     - if grader.active
                       - c = 'active'
                     - else
                       - c = 'inactive'
                     %tr{:class => c}
                       = render :partial => 'grader', :locals => {:grader => grader}
                       - if not grader.terminated
-            -           - if GraderProcess.grader_control_enabled?
+            +           - if GraderScript.grader_control_enabled?
                           %td= link_to 'stop', {:action => 'stop', :id => grader}
                       - else
                         %td= link_to 'clear', {:action => 'clear', :id => grader}
               - else
                 %ul
                   %li None

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

               - content_for :head do
                 = stylesheet_link_tag 'graders'
                 <meta http-equiv ="refresh" content="60"/>
               %h1 Grader information
-            - - form_for :clear, nil, :url => {:action => 'clear_all'} do |f|
+            + .submitbox
-            -   = submit_tag 'Clear all data'
+            +   .item
+            +     Grader control:
+            +   .item
+            +     - form_for :clear, nil, :url => {:action => 'start_grading'} do |f|
+            +       = submit_tag 'Start graders in grading env'
+            +   .item
+            +     - form_for :clear, nil, :url => {:action => 'start_exam'} do |f|
+            +       = submit_tag 'Start graders in exam env'
+            +   .item
+            +     - form_for :clear, nil, :url => {:action => 'stop_all'} do |f|
+            +       = submit_tag 'Stop all running graders'
+            +   .item
+            +     - form_for :clear, nil, :url => {:action => 'clear_all'} do |f|
+            +       = submit_tag 'Clear all data'
+            +   %br{:style => 'clear:both'}/
               - 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'
               %h2 Current graders
               = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
               %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'

public/stylesheets/graders.css ¶ +6 -1

               table.graders tr.active {
                   border: 1px solid black;
                   background: lightgreen;
                   text-align: center;
               }
               table.graders tr.inactive {
                   border: 1px solid black;
                   background: #ffcccc;
                   text-align: center;
-            - }
  No newline at end of file
+            + }
+            +
+            + .submitbox .item {
+            +     padding-right: 5px;
+            +     float: left;
+            + }

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

r203:e7056be0091a - Fri, 27 Nov 2009 10:07:58 - 6 files changed: 81 inserted, 21 deleted

Sign in to your account

Commit r203:e7056be0091a public

Author

r203:e7056be0091a - Fri, 27 Nov 2009 10:07:58 - 6 files changed: 81 inserted, 21 deleted

Commit `r203:e7056be0091a` public