cafe-grader-web Commit - r544:63ac076b653a

cafe-grader-web

Commit `r544:63ac076b653a` public

parent | child

Description:

keep all heartbeat instead of only the latest one (grafted from 0bdf62fde5fdb94d6f94c2b8b8ebc58ffbe8d2f9)

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r544:63ac076b653a - Wed, 16 Sep 2015 05:28:20 - 2 files changed: 24 inserted, 23 deleted

app/controllers/heartbeat_controller.rb ¶ +12 -11

                   @user = User.find_by_login(params[:id])
                   unless @user
                     render text: "LOGIN_NOT_FOUND"
                     return
                   end
-            -     hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
+            +     #hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
-            -     puts "status = #{params[:status]}"
+            +     #puts "status = #{params[:status]}"
-            -     if hb
+            +     #if hb
-            -       if params[:status]
+            +     #  if params[:status]
-            -         hb.status = params[:status]
+            +     #    hb.status = params[:status]
-            -         hb.save
+            +     #    hb.save
-            -       end
+            +     #  end
-            -       hb.touch
+            +     #  hb.touch
-            -     else
+            +     #else
-            -       HeartBeat.creae(user_id: @user.id, ip_address: request.remote_ip)
+            +     #  HeartBeat.creae(user_id: @user.id, ip_address: request.remote_ip)
-            -     end
+            +     #end
+            +     HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip, status: params[:status])
                   render text: "OK"
                 end
                 def index
                   @hb = HeartBeat.includes(:user).order(:user_id).all
                   @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count

db/schema.rb ¶ +12 -12

               # It's strongly recommended to check this file into your version control system.
               ActiveRecord::Schema.define(:version => 20150914223258) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
-            -     t.text     "body",         :limit => 16777215
+            +     t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at",                      :null => false
                   t.datetime "updated_at",                      :null => false
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                   t.string   "name"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "descriptions", :force => true do |t|
-            -     t.text     "body",       :limit => 16777215
+            +     t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "grader_configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at",  :null => false
                   t.datetime "updated_at",  :null => false
-            -     t.text     "description", :limit => 16777215
+            +     t.text     "description"
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
-            -     t.text     "body",                :limit => 16777215
+            +     t.text     "body"
                   t.boolean  "replied"
                   t.datetime "created_at",          :null => false
                   t.datetime "updated_at",          :null => false
                 end
                 create_table "problems", :force => true do |t|
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
-            -     t.text     "data",       :limit => 16777215
+            +     t.text     "data"
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 end
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
-            -     t.text     "source",                :limit => 16777215
+            +     t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message",      :limit => 16777215
+            +     t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
-            -     t.text     "grader_comment",        :limit => 16777215
+            +     t.text     "grader_comment"
                   t.integer  "number"
                   t.string   "source_filename"
                   t.float    "max_runtime"
                   t.integer  "peak_memory"
                   t.integer  "effective_code_length"
                   t.string   "ip_address"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
                 create_table "test_pairs", :force => true do |t|
                   t.integer  "problem_id"
-            -     t.text     "input",      :limit => 2147483647
+            +     t.text     "input",      :limit => 16777215
-            -     t.text     "solution",   :limit => 2147483647
+            +     t.text     "solution",   :limit => 16777215
                   t.datetime "created_at",                     :null => false
                   t.datetime "updated_at",                     :null => false
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
                   t.datetime "updated_at",       :null => false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message", :limit => 16777215
+            +     t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.string   "grader_comment"
                   t.datetime "created_at",       :null => false
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                   t.string   "email"
                   t.integer  "site_id"
                   t.integer  "country_id"
                   t.boolean  "activated",                     :default => false
                   t.datetime "created_at"
                   t.datetime "updated_at"
-            -     t.string   "section"
                   t.boolean  "enabled",                       :default => true
                   t.string   "remark"
                   t.string   "last_ip"
+            +     t.string   "section"
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
               end

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

r544:63ac076b653a - Wed, 16 Sep 2015 05:28:20 - 2 files changed: 24 inserted, 23 deleted

Sign in to your account

Commit r544:63ac076b653a public

Author

r544:63ac076b653a - Wed, 16 Sep 2015 05:28:20 - 2 files changed: 24 inserted, 23 deleted

Commit `r544:63ac076b653a` public