fix

devapp/onu_register.sh

@@ -29,6 +29,6 @@ if grep "${MAC}" "${DHCP_PATH}/${PART_CODE}.conf" > /dev/null; then
 else
   # add new mac
   echo "subclass \"${PART_CODE}\" \"${MAC}\";" >> "${DHCP_PATH}/${PART_CODE}.conf"
-  /usr/bin/sudo /usr/bin/systemctl restart dhcpd.service
+  sudo systemctl restart isc-dhcp-server.service
 fi
 

djing/settings.py

@@ -117,7 +117,7 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-SESSION_ENGINE = 'django.contrib.sessions.backends.file'
+SESSION_ENGINE = 'django.contrib.sessions.backends.db'
 
 SESSION_COOKIE_HTTPONLY = True
 

queue_mngr.py

@@ -4,6 +4,8 @@ from pickle import loads
 from pid.decorator import pidfile
 import socket
 import django
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djing.settings")
+from mydefs import LogicError
 
 
 '''
@@ -18,19 +20,23 @@ obj = {
 
 
 def on_new_data(client_sock, ip):
-    data = client_sock.recv(16384)
-    data = loads(data)
-    action = data['cmd']
-    if action == 'commit':
-        dhcp_commit(
-            data['client_ip'], data['client_mac'],
-            data['switch_mac'], data['switch_port']
-        )
-    elif action == 'expiry':
-        dhcp_expiry(data['client_ip'])
-    elif action == 'release':
-        dhcp_release(data['client_ip'])
-    client_sock.close()
+    try:
+        data = client_sock.recv(16384)
+        data = loads(data)
+        action = data['cmd']
+        if action == 'commit':
+            dhcp_commit(
+                data['client_ip'], data['client_mac'],
+                data['switch_mac'], data['switch_port']
+            )
+        elif action == 'expiry':
+            dhcp_expiry(data['client_ip'])
+        elif action == 'release':
+            dhcp_release(data['client_ip'])
+    except LogicError as e:
+        print('LogicError', e)
+    finally:
+        client_sock.close()
 
 
 @pidfile(pidname='queue_mngr.py.pid', piddir='/run')

systemd_units/djing.service

@@ -3,7 +3,7 @@ Description=A job for djing
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/python3 cron.py > /dev/null
+ExecStart=/usr/bin/python3 cron.py
 WorkingDirectory=/srv/http/djing
 User=http
 Group=http

systemd_units/djing_queue.service

@@ -6,7 +6,7 @@ Type=simple
 ExecStart=/usr/bin/python3 ./queue_mngr.py > /dev/null
 PIDFile=/run/queue_mngr.py.pid
 WorkingDirectory=/var/www/djing
-TimeoutSec=15
+TimeoutSec=30
 Restart=always
 User=http
 Group=http

systemd_units/djing_telebot.service

@@ -3,7 +3,7 @@ Description=Djing telegram bot
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/python3 ./telebot.py > /dev/null
+ExecStart=/usr/bin/python3 ./telebot.py
 PIDFile=/run/djing_telebot.pid
 WorkingDirectory=/var/www/djing
 TimeoutSec=9