mirror of
https://github.com/house-of-vanity/OutFleet.git
synced 2025-08-21 14:37:16 +00:00
Fixed last release
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
from polymorphic.models import PolymorphicModel
|
||||
from django.db import models
|
||||
from vpn.tasks import sync_server
|
||||
|
||||
|
||||
class Server(PolymorphicModel):
|
||||
@@ -18,8 +17,19 @@ class Server(PolymorphicModel):
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
sync_server.delay(self.id)
|
||||
# Only sync if the server actually exists and is valid
|
||||
is_new = self.pk is None
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
# Schedule sync task for existing servers only
|
||||
if not is_new:
|
||||
try:
|
||||
from vpn.tasks import sync_server
|
||||
sync_server.delay(self.id)
|
||||
except Exception as e:
|
||||
import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.error(f"Failed to schedule sync for server {self.name}: {e}")
|
||||
|
||||
def get_server_status(self, *args, **kwargs):
|
||||
return {"name": self.name}
|
||||
|
@@ -86,15 +86,34 @@ class OutlineServer(Server):
|
||||
from vpn.models import User, ACL
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.debug(f"[{self.name}] Sync all users")
|
||||
keys = self.client.get_keys()
|
||||
|
||||
try:
|
||||
keys = self.client.get_keys()
|
||||
except Exception as e:
|
||||
logger.error(f"[{self.name}] Failed to get keys from server: {e}")
|
||||
return False
|
||||
|
||||
acls = ACL.objects.filter(server=self)
|
||||
acl_users = set(acl.user for acl in acls)
|
||||
|
||||
# Log user synchronization details
|
||||
user_list = ", ".join([user.username for user in acl_users])
|
||||
logger.info(f"[{self.name}] Syncing {len(acl_users)} users: {user_list[:200]}{'...' if len(user_list) > 200 else ''}")
|
||||
|
||||
for user in User.objects.all():
|
||||
if user in acl_users:
|
||||
self.add_user(user=user)
|
||||
try:
|
||||
result = self.add_user(user=user)
|
||||
logger.debug(f"[{self.name}] Added user {user.username}: {result}")
|
||||
except Exception as e:
|
||||
logger.error(f"[{self.name}] Failed to add user {user.username}: {e}")
|
||||
else:
|
||||
self.delete_user(user=user)
|
||||
try:
|
||||
result = self.delete_user(user=user)
|
||||
if result and 'status' in result and 'deleted' in result['status']:
|
||||
logger.debug(f"[{self.name}] Removed user {user.username}")
|
||||
except Exception as e:
|
||||
logger.error(f"[{self.name}] Failed to remove user {user.username}: {e}")
|
||||
|
||||
return True
|
||||
|
||||
|
Reference in New Issue
Block a user