cafe-grader-web

Commit r317:df35763dc517 public

parent | child
Description:
does not record login time in analysis mode
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r317:df35763dc517 - - 1 file changed: 2 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -313,66 +313,68
313 313 end
314 314 end
315 315
316 316 # copied from grader/script/lib/test_request_helper.rb
317 317 def extract_running_stat(results)
318 318 running_stat_line = results[-1]
319 319
320 320 # extract exit status line
321 321 run_stat = ""
322 322 if !(/[Cc]orrect/.match(results[0]))
323 323 run_stat = results[0].chomp
324 324 else
325 325 run_stat = 'Program exited normally'
326 326 end
327 327
328 328 logger.info "Stat line: #{running_stat_line}"
329 329
330 330 # extract running time
331 331 if res = /r(.*)u(.*)s/.match(running_stat_line)
332 332 seconds = (res[1].to_f + res[2].to_f)
333 333 time_stat = "Time used: #{seconds} sec."
334 334 else
335 335 seconds = nil
336 336 time_stat = "Time used: n/a sec."
337 337 end
338 338
339 339 # extract memory usage
340 340 if res = /s(.*)m/.match(running_stat_line)
341 341 memory_used = res[1].to_i
342 342 else
343 343 memory_used = -1
344 344 end
345 345
346 346 return {
347 347 :msg => "#{run_stat}\n#{time_stat}",
348 348 :running_time => seconds,
349 349 :exit_status => run_stat,
350 350 :memory_usage => memory_used
351 351 }
352 352 end
353 353
354 354 def confirm_and_update_start_time
355 355 user = User.find(session[:user_id])
356 356 if (Configuration.indv_contest_mode? and
357 357 Configuration['contest.confirm_indv_contest_start'] and
358 358 !user.contest_started?)
359 359 redirect_to :action => 'confirm_contest_start' and return
360 360 end
361 + if not Configuration.analysis_mode?
361 362 user.update_start_time
362 363 end
364 + end
363 365
364 366 def reject_announcement_refresh_when_logged_out
365 367 if not session[:user_id]
366 368 render :text => 'Access forbidden', :status => 403
367 369 end
368 370
369 371 if Configuration.multicontests?
370 372 user = User.find(session[:user_id])
371 373 if user.contest_stat.forced_logout
372 374 render :text => 'Access forbidden', :status => 403
373 375 end
374 376 end
375 377 end
376 378
377 379 end
378 380
You need to be logged in to leave comments. Login now