cafe-grader-web Commit - r538:4c7c815d4901

cafe-grader-web

Commit `r538:4c7c815d4901` public

parent | child

Description:

add config for heartbeat response update heartbeat view

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r538:4c7c815d4901 - Wed, 16 Sep 2015 06:10:41 - 4 files changed: 20 inserted, 5 deleted

db/migrate/20150916054105_update_heart_beat.rb created 644 ¶ +10

@@ -0,0 +1,10
	1	+ class UpdateHeartBeat < ActiveRecord::Migration
	2	+ def up
	3	+ GraderConfiguration.create key: 'right.heartbeat_response', value_type: 'string', value:'OK', description:'Heart beat response text'
	4	+ add_index :heart_beats, :updated_at
	5	+ end
	6	+
	7	+ def down
	8	+ remove_index :heart_beats, :updated_at
	9	+ end
	10	+ end

app/controllers/heartbeat_controller.rb ¶ +3 -2

               class HeartbeatController < ApplicationController
                 before_filter :admin_authorization, :only => ['index']
                 def edit
                   @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
                   #puts "status = #{params[:status]}"
                   #if hb
                   #  if params[:status]
                   #    hb.status = params[:status]
                   #    hb.save
                   #  end
                   #  hb.touch
                   #else
                   #  HeartBeat.creae(user_id: @user.id, ip_address: request.remote_ip)
                   #end
                   HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip, status: params[:status])
-            -     render text: "OK"
+            +     render text: (GraderConfiguration['right.heartbeat_response'] || 'OK')
                 end
                 def index
-            -     @hb = HeartBeat.includes(:user).order(:user_id).all
+            +     @hb = HeartBeat.where("updated_at >= ?",Time.zone.now-2.hours).includes(:user).order(:user_id).all
                   @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count
                 end
               end

app/views/heartbeat/index.html.haml ¶ +4 -2

               - content_for :header do
                 = javascript_include_tag 'local_jquery'
                 = stylesheet_link_tag 'tablesorter-theme.cafe'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#my_table').tablesorter({widgets: ['zebra']});
                 });
               %h1 Heart Beat Count
               = "Last 5 minutes distinct user count = #{@num}"
-            - %h1 Heart Beat List
+            + %h1 Heart Beat from preview 2 hours
               %table.tablesorter-cafe#my_table
                 %thead
                   %tr
                     %th Login
                     %th Full name
                     %th IP
-            -       %th Last Update
+            +       %th Status
+            +       %th Update
                 %tbody
                   - @hb.each do |hb|
                     %tr{class: cycle('info-even','info-odd')}
                       %td= link_to hb.user.login, controller: :users, :action => 'profile', :id => hb.user.id
                       %td= hb.user.full_name
                       %td= hb.ip_address
+            +         %td= hb.status
                       %td= "#{time_ago_in_words(hb.updated_at)} ago"

db/schema.rb ¶ +3 -1

               # encoding: UTF-8
               # 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 => 20150914223258) do
+            + ActiveRecord::Schema.define(:version => 20150916054105) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   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   "notes"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.boolean  "enabled"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.string   "name"
                 end
                 create_table "contests_problems", :id => false, :force => true do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 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",               :null => false
                   t.datetime "updated_at",               :null => false
                   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 "heart_beats", :force => true do |t|
                   t.integer  "user_id"
                   t.string   "ip_address"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.string   "status"
                 end
+            +   add_index "heart_beats", ["updated_at"], :name => "index_heart_beats_on_updated_at"
+            +
                 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 "logins", :force => true do |t|
                   t.integer  "user_id"
                   t.string   "ip_address"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
                   t.text     "body"
                   t.boolean  "replied"
                   t.datetime "created_at",          :null => false
                   t.datetime "updated_at",          :null => false
                 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

r538:4c7c815d4901 - Wed, 16 Sep 2015 06:10:41 - 4 files changed: 20 inserted, 5 deleted

Sign in to your account

Commit r538:4c7c815d4901 public

Author

r538:4c7c815d4901 - Wed, 16 Sep 2015 06:10:41 - 4 files changed: 20 inserted, 5 deleted

Commit `r538:4c7c815d4901` public