Description:
[web] fixed bug in grader_process update
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@254 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
Author
jittat
-
r126:b4095ef6a972 - - 1 file changed: 8 inserted, 2 deleted
| @@ -13,45 +13,51 | |||
|
|
13 | 13 | if grader |
|
|
14 | 14 | grader.mode = mode |
|
|
15 | 15 | grader.active = nil |
|
|
16 | 16 | grader.task_id = nil |
|
|
17 | 17 | grader.task_type = nil |
|
|
18 | 18 | grader.save |
|
|
19 | 19 | else |
|
|
20 | 20 | grader = GraderProcess.create(:host => host, |
|
|
21 | 21 | :pid => pid, |
|
|
22 | 22 | :mode => mode) |
|
|
23 | 23 | end |
|
|
24 | 24 | grader |
|
|
25 | 25 | end |
|
|
26 | 26 | |
|
|
27 | 27 | def self.find_stalled_process() |
|
|
28 | 28 | GraderProcess.find(:all, |
|
|
29 | 29 | :conditions => ["active AND updated_at < ?", |
|
|
30 | 30 | Time.now.gmtime - GraderProcess.stalled_time]) |
|
|
31 | 31 | end |
|
|
32 | 32 | |
|
|
33 | 33 | def report_active(task=nil) |
|
|
34 | 34 | self.active = true |
|
|
35 | 35 | if task!=nil |
|
|
36 | 36 | self.task_id = task.id |
|
|
37 | + self.task_type = task.class.to_s | |
|
|
37 | 38 | else |
|
|
38 | 39 | self.task_id = nil |
|
|
40 | + self.task_type = nil | |
|
|
39 | 41 | end |
|
|
40 | - self.task_type = task.class.to_s | |
|
|
41 | 42 | self.save |
|
|
42 | 43 | end |
|
|
43 | 44 | |
|
|
44 | - def report_inactive() | |
|
|
45 | + def report_inactive(task=nil) | |
|
|
45 | 46 | self.active = false |
|
|
47 | + if task!=nil | |
|
|
48 | + self.task_id = task.id | |
|
|
49 | + self.task_type = task.class.to_s | |
|
|
50 | + else | |
|
|
46 | 51 | self.task_id = nil |
|
|
47 | 52 | self.task_type = nil |
|
|
53 | + end | |
|
|
48 | 54 | self.save |
|
|
49 | 55 | end |
|
|
50 | 56 | |
|
|
51 | 57 | protected |
|
|
52 | 58 | |
|
|
53 | 59 | def self.stalled_time() |
|
|
54 | 60 | return 1.minute |
|
|
55 | 61 | end |
|
|
56 | 62 | |
|
|
57 | 63 | end |
You need to be logged in to leave comments.
Login now