cafe-grader-web

Commit r34:5e680c886b7e public

parent | child
Description:
renamed ip to host in GraderProcess git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@64 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r34:5e680c886b7e - - 6 files changed: 35 inserted, 11 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,9
1 + class RenameGraderProcessColumnIpToHost < ActiveRecord::Migration
2 + def self.up
3 + rename_column :grader_processes, :ip, :host
4 + end
5 +
6 + def self.down
7 + rename_column :grader_processes, :host, :ip
8 + end
9 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -2,23 +2,23
2 2
3 3 belongs_to :task
4 4
5 - def self.find_by_ip_and_pid(ip,pid)
5 + def self.find_by_host_and_pid(host,pid)
6 6 return GraderProcess.find(:first,
7 7 :conditions => {
8 - :ip => ip,
8 + :host => host,
9 9 :pid => pid
10 10 })
11 11 end
12 -
13 - def self.register(ip,pid,mode)
14 - grader = GraderProcess.find_by_ip_and_pid(ip,pid)
12 +
13 + def self.register(host,pid,mode)
14 + grader = GraderProcess.find_by_host_and_pid(host,pid)
15 15 if grader
16 16 grader.mode = mode
17 17 grader.active = nil
18 18 grader.task_id = nil
19 19 grader.save
20 20 else
21 - grader = GraderProcess.create(:ip => ip,
21 + grader = GraderProcess.create(:host => host,
22 22 :pid => pid,
23 23 :mode => mode)
24 24 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -8,14 +8,29
8 8 self.status = Task::STATUS_INQUEUE
9 9 end
10 10
11 + def status_inqueue!
12 + status_inqueue
13 + self.save
14 + end
15 +
11 16 def status_grading
12 17 self.status = Task::STATUS_GRADING
13 18 end
14 19
20 + def status_grading!
21 + status_grading
22 + self.save
23 + end
24 +
15 25 def status_complete
16 26 self.status = Task::STATUS_COMPLETE
17 27 end
18 28
29 + def status_complete!
30 + status_complete
31 + self.save
32 + end
33 +
19 34 def self.get_inqueue_and_change_status(status)
20 35 task = nil
21 36 begin
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,5 +1,5
1 1
2 - %td= grader.ip
2 + %td= grader.host
3 3 %td= grader.pid
4 4 %td= grader.updated_at.strftime("%H:%M:%S") if grader.updated_at!=nil
5 5 %td
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,7 +1,7
1 1
2 2 %table.graders
3 3 %tr
4 - %th ip
4 + %th host
5 5 %th pid
6 6 %th last updated
7 7 %th task
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -9,10 +9,10
9 9 #
10 10 # It's strongly recommended to check this file into your version control system.
11 11
12 - ActiveRecord::Schema.define(:version => 16) do
12 + ActiveRecord::Schema.define(:version => 17) do
13 13
14 14 create_table "grader_processes", :force => true do |t|
15 - t.string "ip", :limit => 20
15 + t.string "host", :limit => 20
16 16 t.integer "pid"
17 17 t.string "mode"
18 18 t.boolean "active"
@@ -21,7 +21,7
21 21 t.integer "task_id"
22 22 end
23 23
24 - add_index "grader_processes", ["ip", "pid"], :name => "index_grader_processes_on_ip_and_pid"
24 + add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
25 25
26 26 create_table "languages", :force => true do |t|
27 27 t.string "name", :limit => 10
You need to be logged in to leave comments. Login now