Description:
copy working trunk (r383, before major changes to combine judge and to support grader message queue) to trunk
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@396 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r188:0b607f9b89c1 - - 12 files changed: 15 inserted, 401 deleted
@@ -0,0 +1,10 | |||
|
1 | + # Rails app directory | |
|
2 | + RAILS_ROOT = "/home/jittat/web_grader" | |
|
3 | + | |
|
4 | + GRADER_ROOT = "/home/jittat/grader/scripts" | |
|
5 | + | |
|
6 | + # This load all required codes | |
|
7 | + require File.join(File.dirname(__FILE__),'../lib/boot') | |
|
8 | + | |
|
9 | + # load the required environment file | |
|
10 | + require File.dirname(__FILE__) + "/env_#{GRADER_ENV}.rb" |
@@ -9,7 +9,7 | |||
|
9 | 9 | # |
|
10 | 10 | # It's strongly recommended to check this file into your version control system. |
|
11 | 11 | |
|
12 |
- ActiveRecord::Schema.define(:version => 2009042 |
|
|
12 | + ActiveRecord::Schema.define(:version => 20090426131044) do | |
|
13 | 13 | |
|
14 | 14 | create_table "announcements", :force => true do |t| |
|
15 | 15 | t.string "author" |
@@ -42,17 +42,6 | |||
|
42 | 42 | t.datetime "updated_at" |
|
43 | 43 | end |
|
44 | 44 | |
|
45 | - create_table "grader_messages", :force => true do |t| | |
|
46 | - t.integer "grader_process_id" | |
|
47 | - t.integer "command" | |
|
48 | - t.string "options" | |
|
49 | - t.integer "target_id" | |
|
50 | - t.boolean "taken" | |
|
51 | - t.integer "taken_grader_process_id" | |
|
52 | - t.datetime "created_at" | |
|
53 | - t.datetime "updated_at" | |
|
54 | - end | |
|
55 | - | |
|
56 | 45 | create_table "grader_processes", :force => true do |t| |
|
57 | 46 | t.string "host", :limit => 20 |
|
58 | 47 | t.integer "pid" |
@@ -28,7 +28,7 | |||
|
28 | 28 | raise "Log directory does not exist: #{config.log_dir}" |
|
29 | 29 | end |
|
30 | 30 | config.log_dir + |
|
31 | - "/#{GRADER_ENV}.#{Process.pid}" | |
|
31 | + "/#{GRADER_ENV}_#{config.grader_mode}.#{Process.pid}" | |
|
32 | 32 | end |
|
33 | 33 | |
|
34 | 34 | def log(str) |
@@ -71,7 +71,7 | |||
|
71 | 71 | copy_log = copy_script(problem_home) |
|
72 | 72 | save_copy_log(problem_home,copy_log) |
|
73 | 73 | end |
|
74 | - | |
|
74 | + | |
|
75 | 75 | call_judge(problem_home,language,grading_dir,source_name) |
|
76 | 76 | |
|
77 | 77 | @reporter.report(submission,"#{grading_dir}/test-result") |
@@ -102,7 +102,7 | |||
|
102 | 102 | def call_judge(problem_home,language,grading_dir,fname) |
|
103 | 103 | ENV['PROBLEM_HOME'] = problem_home |
|
104 | 104 | |
|
105 |
- talk |
|
|
105 | + talk grading_dir | |
|
106 | 106 | Dir.chdir grading_dir |
|
107 | 107 | cmd = "#{problem_home}/script/judge #{language} #{fname}" |
|
108 | 108 | talk "CMD: #{cmd}" |
deleted file |
deleted file |
deleted file |
deleted file |
deleted file |
deleted file |
deleted file |
You need to be logged in to leave comments.
Login now