Mirrors/wireguard_webadmin
1
0
Fork 0
mirror of https://github.com/eduardogsilva/wireguard_webadmin.git synced 2026-02-19 19:26:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved peer scheduler cron.

Browse Source
This commit is contained in:
Eduardo Silva
2026-02-04 11:22:22 -03:00
parent 3492565ebc
commit dc0a269af4
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
api/views.py
View File

@@ -30,6 +30,7 @@ from wgwadmlibrary.tools import create_peer_invite, get_peer_invite_data, send_e
user_has_access_to_peer user_has_access_to_peer
from wireguard.models import Peer, PeerStatus, WebadminSettings, WireGuardInstance from wireguard.models import Peer, PeerStatus, WebadminSettings, WireGuardInstance
from wireguard_tools.functions import func_reload_wireguard_interface from wireguard_tools.functions import func_reload_wireguard_interface
from wireguard_tools.views import export_wireguard_configuration
def get_api_key(api_name): def get_api_key(api_name):
@@ -413,8 +414,6 @@ def cron_refresh_wireguard_status_cache(request):
def cron_peer_scheduler(request): def cron_peer_scheduler(request):
success = True
message = ''
now = timezone.now() now = timezone.now()
data = { data = {
'status': 'success', 'status': 'success',
@@ -424,55 +423,64 @@ def cron_peer_scheduler(request):
'scheduled_peers_suspended': 0, 'scheduled_peers_suspended': 0,
'scheduled_peers_unsuspended': 0, 'scheduled_peers_unsuspended': 0,
} }
interface_list = []
pending_schedulings = PeerScheduling.objects.filter( interfaces = set()
Q(next_scheduled_enable_at__lte=now) |
Q(next_scheduled_disable_at__lte=now) | pending_schedulings = (
Q(next_manual_suspend_at__lte=now) | PeerScheduling.objects
Q(next_manual_unsuspend_at__lte=now) .select_related('peer', 'peer__wireguard_instance')
.filter(
Q(next_scheduled_enable_at__lte=now) |
Q(next_scheduled_disable_at__lte=now) |
Q(next_manual_suspend_at__lte=now) |
Q(next_manual_unsuspend_at__lte=now)
)
) )
for peer_scheduling in pending_schedulings: for peer_scheduling in pending_schedulings:
if peer_scheduling.next_scheduled_enable_at and peer_scheduling.next_scheduled_enable_at <= now: if peer_scheduling.next_scheduled_enable_at and peer_scheduling.next_scheduled_enable_at <= now:
data['scheduled_peers_enabled'] += 1 data['scheduled_peers_enabled'] += 1
peer_scheduling.next_scheduled_enable_at = None peer_scheduling.next_scheduled_enable_at = None
peer_scheduling.peer.disabled_by_schedule = False peer_scheduling.peer.disabled_by_schedule = False
if peer_scheduling.peer.wireguard_instance not in interface_list: interfaces.add(peer_scheduling.peer.wireguard_instance)
interface_list.append(peer_scheduling.peer.wireguard_instance)
if peer_scheduling.next_scheduled_disable_at and peer_scheduling.next_scheduled_disable_at <= now: if peer_scheduling.next_scheduled_disable_at and peer_scheduling.next_scheduled_disable_at <= now:
data['scheduled_peers_disabled'] += 1 data['scheduled_peers_disabled'] += 1
peer_scheduling.next_scheduled_disable_at = None peer_scheduling.next_scheduled_disable_at = None
peer_scheduling.peer.disabled_by_schedule = True peer_scheduling.peer.disabled_by_schedule = True
if peer_scheduling.peer.wireguard_instance not in interface_list: interfaces.add(peer_scheduling.peer.wireguard_instance)
interface_list.append(peer_scheduling.peer.wireguard_instance)
if peer_scheduling.next_manual_unsuspend_at and peer_scheduling.next_manual_unsuspend_at <= now: if peer_scheduling.next_manual_unsuspend_at and peer_scheduling.next_manual_unsuspend_at <= now:
data['scheduled_peers_unsuspended'] += 1 data['scheduled_peers_unsuspended'] += 1
peer_scheduling.next_manual_unsuspend_at = None peer_scheduling.next_manual_unsuspend_at = None
peer_scheduling.peer.suspended = False peer_scheduling.peer.suspended = False
peer_scheduling.peer.suspend_reason = '' peer_scheduling.peer.suspend_reason = ''
if peer_scheduling.peer.wireguard_instance not in interface_list: interfaces.add(peer_scheduling.peer.wireguard_instance)
interface_list.append(peer_scheduling.peer.wireguard_instance)
if peer_scheduling.next_manual_suspend_at and peer_scheduling.next_manual_suspend_at <= now: if peer_scheduling.next_manual_suspend_at and peer_scheduling.next_manual_suspend_at <= now:
data['scheduled_peers_suspended'] += 1 data['scheduled_peers_suspended'] += 1
peer_scheduling.next_manual_suspend_at = None peer_scheduling.next_manual_suspend_at = None
peer_scheduling.peer.suspended = True peer_scheduling.peer.suspended = True
peer_scheduling.peer.suspend_reason = peer_scheduling.manual_suspend_reason peer_scheduling.peer.suspend_reason = peer_scheduling.manual_suspend_reason
if peer_scheduling.peer.wireguard_instance not in interface_list: interfaces.add(peer_scheduling.peer.wireguard_instance)
interface_list.append(peer_scheduling.peer.wireguard_instance)
peer_scheduling.peer.save() peer_scheduling.peer.save()
peer_scheduling.save() peer_scheduling.save()
for wireguard_instance in interface_list: errors = []
success, message = func_reload_wireguard_interface(wireguard_instance) for wireguard_instance in interfaces:
export_wireguard_configuration(wireguard_instance)
ok, msg = func_reload_wireguard_interface(wireguard_instance)
if not ok:
errors.append(f"wg{wireguard_instance.instance_id} - {msg}")
if not success: if errors:
data['status'] = 'error' data['status'] = 'error'
data['message'] = message data['message'] = " | ".join(errors)
return JsonResponse(data, status=500)
return JsonResponse(data, status=200)
return JsonResponse(data)
@require_http_methods(["GET"]) @require_http_methods(["GET"])
def wireguard_status(request): def wireguard_status(request):