summaryrefslogtreecommitdiff
path: root/sbhs_server
diff options
context:
space:
mode:
authordk-152017-05-26 00:01:35 +0530
committerdk-152017-05-26 00:01:35 +0530
commitaf581060fcb22ea5aa664e11f942e3fb108ed182 (patch)
tree9024c9fcfa706379189fbf09e4e8e2719ff727aa /sbhs_server
parentc33417821258d583e24e91b7cc6933bb66994ec0 (diff)
downloadSBHS-2018-Rpi-af581060fcb22ea5aa664e11f942e3fb108ed182.tar.gz
SBHS-2018-Rpi-af581060fcb22ea5aa664e11f942e3fb108ed182.tar.bz2
SBHS-2018-Rpi-af581060fcb22ea5aa664e11f942e3fb108ed182.zip
Add new_cron_job.sh for django 1.11 and include log_generator in maintenance management
Diffstat (limited to 'sbhs_server')
-rw-r--r--sbhs_server/sbhs.py2
-rw-r--r--sbhs_server/settings.py7
2 files changed, 6 insertions, 3 deletions
diff --git a/sbhs_server/sbhs.py b/sbhs_server/sbhs.py
index c9620e9..f7873cb 100644
--- a/sbhs_server/sbhs.py
+++ b/sbhs_server/sbhs.py
@@ -1,7 +1,7 @@
import serial
import os
from time import localtime, strftime, sleep
-import sbhs_server.credentials as credentials
+import credentials
MAP_FILE = credentials.MAP_FILE
#LOG_FILE = '../log/sbhserr.log'
diff --git a/sbhs_server/settings.py b/sbhs_server/settings.py
index b7ec8b7..1b6091f 100644
--- a/sbhs_server/settings.py
+++ b/sbhs_server/settings.py
@@ -72,6 +72,7 @@ INSTALLED_APPS = (
'slot',
'sbhs_server.tables',
'webcam',
+ 'maintenance',
)
MIDDLEWARE = (
@@ -236,8 +237,10 @@ WEBCAM_STATIC_DIR = 'img/webcam/'
if not is_production:
SBHS_ADMINS = (
- ("Amol Mandhane", "+91-9999999999", "amol_mandhane@iitb.ac.in"),
- ("Amol Mandhane", "+91-9999999999", "amol_mandhane@iitb.ac.in"),
+ # ("Amol Mandhane", "+91-9999999999", "amol_mandhane@iitb.ac.in"),
+ # ("Amol Mandhane", "+91-9999999999", "amol_mandhane@iitb.ac.in"),
+ ('Debakanta Kar' , '0123456789' , 'kar.bubu.15@gmail.com'),
+ ('Deep Bhattacharyya' , '9876543210' , 'cr7.rick@gmail.com')
)
else:
from sbhs_server.sbhs_admin_config import SBHS_ADMINS