From c883413f4e7ef4642f9d18a0d383612f6abd9391 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 15 Nov 2017 16:50:24 +0530
Subject: - Add python-decouple package to requirements - Use sane defaults and
 python-decouple in yaksh.settings module - Replace hard coded localhost
 domain name referring to code server with dynamic settings variable

---
 yaksh/views.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'yaksh/views.py')

diff --git a/yaksh/views.py b/yaksh/views.py
index a4d9e78..a001ffd 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -35,7 +35,7 @@ except ImportError:
     from io import BytesIO as string_io
 import re
 # Local imports.
-from yaksh.code_server import get_result as get_result_from_code_server, SERVER_POOL_PORT
+from yaksh.code_server import get_result as get_result_from_code_server,
 from yaksh.models import (
     Answer, AnswerPaper, AssignmentUpload, Course, FileUpload, FloatTestCase,
     HookTestCase, IntegerTestCase, McqTestCase, Profile,
@@ -51,6 +51,7 @@ from yaksh.forms import (
     UploadFileForm, get_object_form, FileForm, QuestionPaperForm, LessonForm,
     LessonFileForm, LearningModuleForm, ExerciseForm
 )
+from yaksh.settings import SERVER_POOL_PORT, SERVER_HOST_NAME 
 from .settings import URL_ROOT
 from .file_utils import extract_files, is_csv
 from .send_emails import send_user_mail, generate_activation_key, send_bulk_mail
@@ -782,7 +783,7 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None,
         )
         if current_question.type in ['code', 'upload']:
             if paper.time_left() <= 0 and not paper.question_paper.quiz.is_exercise:
-                url = 'http://localhost:%s' % SERVER_POOL_PORT
+                url = '{0}:{1}'.format(SERVER_HOST_NAME, SERVER_POOL_PORT)
                 result_details = get_result_from_code_server(url, uid, block=True)
                 result = json.loads(result_details.get('result'))
                 next_question, error_message, paper = _update_paper(request, uid,
@@ -807,7 +808,7 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None,
 @csrf_exempt
 def get_result(request, uid, course_id, module_id):
     result = {}
-    url = 'http://localhost:%s' % SERVER_POOL_PORT
+    url = '{0}:{1}'.format(SERVER_HOST_NAME, SERVER_POOL_PORT)
     result_state = get_result_from_code_server(url, uid)
     result['status'] = result_state.get('status')
     if result['status'] == 'done':
-- 
cgit 


From 6f2e29a067cbeaf88b8ea478bb7c24fe8772180a Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 20 Nov 2017 16:07:43 +0530
Subject: Multiple Changes: - Add python-decouple package to requirements - use
 sane defaults and python-decouple in yaksh.settings and online_test.settings
 module - Replace hardcoded localhost domain name referring to code server
 with dynamic - Move Dockerfile to dedicated directory - Add dynamic
 run-as-admin commands to the base command depending on OS - Replace linux
 specific commands like cp with Python functions

---
 yaksh/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/views.py')

diff --git a/yaksh/views.py b/yaksh/views.py
index a001ffd..8fe4523 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -35,7 +35,7 @@ except ImportError:
     from io import BytesIO as string_io
 import re
 # Local imports.
-from yaksh.code_server import get_result as get_result_from_code_server,
+from yaksh.code_server import get_result as get_result_from_code_server
 from yaksh.models import (
     Answer, AnswerPaper, AssignmentUpload, Course, FileUpload, FloatTestCase,
     HookTestCase, IntegerTestCase, McqTestCase, Profile,
-- 
cgit