From 872434be58ca65535ce6e798a19b8de6236d576b Mon Sep 17 00:00:00 2001
From: Bianca Severino <biancasev@gmail.com>
Date: Fri, 2 Apr 2021 11:18:10 -0400
Subject: [PATCH] fix: allow ping interval to be set in django settings

---
 CHANGELOG.rst               | 4 ++++
 edx_proctoring/__init__.py  | 2 +-
 edx_proctoring/constants.py | 8 ++++++--
 package.json                | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c1cffe41f7c..980c19397e4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,10 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[3.8.2] - 2021-04-02
+~~~~~~~~~~~~~~~~~~~~~
+* Update `DEFAULT_DESKTOP_APPLICATION_PING_INTERVAL_SECONDS` to pull from settings.
+
 [3.8.1] - 2021-04-01
 ~~~~~~~~~~~~~~~~~~~~~
 * Increase ping interval from 30 to 60 seconds.
diff --git a/edx_proctoring/__init__.py b/edx_proctoring/__init__.py
index d8a87756e72..79b7a818827 100644
--- a/edx_proctoring/__init__.py
+++ b/edx_proctoring/__init__.py
@@ -3,6 +3,6 @@
 """
 
 # Be sure to update the version number in edx_proctoring/package.json
-__version__ = '3.8.1'
+__version__ = '3.8.2'
 
 default_app_config = 'edx_proctoring.apps.EdxProctoringConfig'  # pylint: disable=invalid-name
diff --git a/edx_proctoring/constants.py b/edx_proctoring/constants.py
index 3739016d8d9..63897b7f525 100644
--- a/edx_proctoring/constants.py
+++ b/edx_proctoring/constants.py
@@ -56,8 +56,12 @@
     else getattr(settings, 'SOFTWARE_SECURE_SHUT_DOWN_GRACEPERIOD', 10)
 )
 
-MINIMUM_TIME = datetime.datetime.fromtimestamp(0)
+DEFAULT_DESKTOP_APPLICATION_PING_INTERVAL_SECONDS = (
+    settings.PROCTORING_SETTINGS['DESKTOP_APPLICATION_PING_INTERVAL_SECONDS'] if
+    'DESKTOP_APPLICATION_PING_INTERVAL_SECONDS' in settings.PROCTORING_SETTINGS
+    else getattr(settings, 'DESKTOP_APPLICATION_PING_INTERVAL_SECONDS', 60)
+)
 
-DEFAULT_DESKTOP_APPLICATION_PING_INTERVAL_SECONDS = 60
+MINIMUM_TIME = datetime.datetime.fromtimestamp(0)
 
 PING_FAILURE_PASSTHROUGH_TEMPLATE = 'edx_proctoring.{}_ping_failure_passthrough'
diff --git a/package.json b/package.json
index 1edf7f12609..46d5beb7862 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "@edx/edx-proctoring",
   "//": "Be sure to update the version number in edx_proctoring/__init__.py",
   "//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "main": "edx_proctoring/static/index.js",
   "scripts":{
     "test":"gulp test"