cafe-grader-web Commit - r34:5e680c886b7e

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r34:5e680c886b7e - Mon, 25 Feb 2008 14:11:44 - 6 files changed: 35 inserted, 11 deleted

db/migrate/017_rename_grader_process_column_ip_to_host.rb created 644 ¶ +9

@@ -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

app/models/grader_process.rb ¶ +6 -6

               class GraderProcess < ActiveRecord::Base
                 belongs_to :task
-            -   def self.find_by_ip_and_pid(ip,pid)
+            +   def self.find_by_host_and_pid(host,pid)
                   return GraderProcess.find(:first,
                                             :conditions => {
-            -                                 :ip => ip,
+            +                                 :host => host,
                                               :pid => pid
                                             })
                 end
+            +
-            -   def self.register(ip,pid,mode)
+            +   def self.register(host,pid,mode)
-            -     grader = GraderProcess.find_by_ip_and_pid(ip,pid)
+            +     grader = GraderProcess.find_by_host_and_pid(host,pid)
                   if grader
                     grader.mode = mode
                     grader.active = nil
                     grader.task_id = nil
                     grader.save
                   else
-            -       grader = GraderProcess.create(:ip => ip,
+            +       grader = GraderProcess.create(:host => host,
                                                   :pid => pid,
                                                   :mode => mode)
                   end
                   grader
                 end
                 def self.find_stalled_process()
                   GraderProcess.find(:all,
                                      :conditions => ["active AND updated_at < ?",
                                                      Time.now.gmtime - GraderProcess.stalled_time])
                 end

app/models/task.rb ¶ +15

               class Task < ActiveRecord::Base
                 STATUS_GRADING = 0
                 STATUS_INQUEUE = 1
                 STATUS_COMPLETE = 2
                 def status_inqueue
                   self.status = Task::STATUS_INQUEUE
                 end
+            +   def status_inqueue!
+            +     status_inqueue
+            +     self.save
+            +   end
+            +
                 def status_grading
                   self.status = Task::STATUS_GRADING
                 end
+            +   def status_grading!
+            +     status_grading
+            +     self.save
+            +   end
+            +
                 def status_complete
                   self.status = Task::STATUS_COMPLETE
                 end
+            +   def status_complete!
+            +     status_complete
+            +     self.save
+            +   end
+            +
                 def self.get_inqueue_and_change_status(status)
                   task = nil
                   begin
                     Task.transaction do
                       task = Task.find(:first,
                                        :order => "created_at",
                                        :conditions => {:status=> Task::STATUS_INQUEUE},
                                        :lock => true)
                       if task!=nil
                         task.status = status
                         task.save!
                       end

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

-            - %td= grader.ip
+            + %td= grader.host
               %td= grader.pid
               %td= grader.updated_at.strftime("%H:%M:%S") if grader.updated_at!=nil
               %td
                 - if grader.task_id==nil
                   \-
                 - else
                   = grader.task_id

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

               %table.graders
                 %tr
-            -     %th ip
+            +     %th host
                   %th pid
                   %th last updated
                   %th task
                 - grader_list.each do |grader|
                   - if grader.active
                     - c = 'active'
                   - else
                     - c = 'inactive'
                   %tr{:class => c}
                     = render :partial => 'grader', :locals => {:grader => grader}
                     %td= link_to 'clear', {:action => 'clear', :id => grader}

db/schema.rb ¶ +3 -3

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of ActiveRecord 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 => 16) do
+            + ActiveRecord::Schema.define(:version => 17) do
                 create_table "grader_processes", :force => true do |t|
-            -     t.string   "ip",         :limit => 20
+            +     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"
                 end
-            -   add_index "grader_processes", ["ip", "pid"], :name => "index_grader_processes_on_ip_and_pid"
+            +   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
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",       :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"

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

r34:5e680c886b7e - Mon, 25 Feb 2008 14:11:44 - 6 files changed: 35 inserted, 11 deleted

Sign in to your account

Commit r34:5e680c886b7e public

Author

r34:5e680c886b7e - Mon, 25 Feb 2008 14:11:44 - 6 files changed: 35 inserted, 11 deleted

Commit `r34:5e680c886b7e` public