Description:
merge
Commit status:
[Not Reviewed]
References:
merge java
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment

r177:c2734213b50c - - 1 file changed: 1 inserted, 1 deleted

@@ -384,88 +384,88
384 384
385 385 if submission!=nil
386 386 runner.grade_submission(submission)
387 387 end
388 388 end
389 389 end
390 390
391 391 #########################################
392 392 # main program
393 393 #########################################
394 394
395 395 options = process_options_and_stop_file
396 396 GRADER_ENV = options[:environment]
397 397 grader_mode = options[:mode]
398 398 dry_run = options[:dry_run]
399 399
400 400 puts "environment: #{GRADER_ENV}"
401 401 puts "grader mode: #{grader_mode}"
402 402 require File.join(File.dirname(__FILE__),'config/environment')
403 403
404 404 # add grader_mode to config
405 405 # this is needed because method log needs it. TODO: clean this up
406 406 class << config
407 407 attr_accessor :grader_mode
408 408 end
409 409 config.grader_mode = grader_mode
410 410
411 411 # reading rails environment
412 412 log 'Reading rails environment'
413 413
414 414 RAILS_ENV = config.rails_env
415 415 require RAILS_ROOT + '/config/environment'
416 416
417 417 # register grader process
418 418 if config.report_grader
419 419 grader_proc = GraderProcess.register(config.grader_hostname,
420 420 Process.pid,
421 421 grader_mode)
422 422 else
423 423 grader_proc = nil
424 424 end
425 425
426 426 #set loggin environment
427 427 ENV['GRADER_LOGGING'] = log_file_name
428 428 if options[:err_log]
429 429 err_file_name = log_file_name + '.err'
430 430 $stderr.reopen(err_file_name,"a")
431 431 log "STDERR log to file [#{err_file_name}]"
432 - warn "start logging for grader PID #{Process.id} on #{Time.now.in_time_zone}"
432 + warn "start logging for grader PID #{Process.pid} on #{Time.now.in_time_zone}"
433 433 end
434 434
435 435
436 436 # register exit handler to report inactive, and terminated
437 437 at_exit do
438 438 if grader_proc!=nil
439 439 grader_proc.report_inactive
440 440 grader_proc.terminate
441 441 end
442 442 end
443 443
444 444 #
445 445 # MAIN LOOP
446 446 #
447 447
448 448 case grader_mode
449 449 when "queue"
450 450 grader_queue_loop(grader_proc, options)
451 451
452 452 when "test_request"
453 453 grader_test_request_loop(grader_proc, options)
454 454
455 455 when "prob"
456 456 grader_grade_problems(grader_proc, options)
457 457
458 458 when "contest"
459 459 grader_grade_contests(grader_proc, options)
460 460
461 461 when "sub"
462 462 grader_grade_submissions(grader_proc, options)
463 463
464 464 when "autonew"
465 465 grader_autonew_loop(grader_proc, options)
466 466
467 467 else
468 468 display_manual
469 469 exit(0)
470 470 end
471 471
You need to be logged in to leave comments. Login now