From 3f5f72a78d4021f43761e4a67d57d887572f9640 Mon Sep 17 00:00:00 2001 From: virusdefender Date: Tue, 24 Jan 2017 16:22:22 +0800 Subject: [PATCH] git ip when service url is used --- conf/views.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/conf/views.py b/conf/views.py index 1a6118f6..528f54e3 100644 --- a/conf/views.py +++ b/conf/views.py @@ -100,10 +100,6 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView): if hashlib.sha256(token.encode("utf-8")).hexdigest() != judge_server_token: return self.error("Invalid token") service_url = data.get("service_url") - if service_url: - ip = None - else: - ip = request.META["REMOTE_ADDR"] try: server = JudgeServer.objects.get(hostname=data["hostname"]) @@ -112,7 +108,7 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView): server.memory_usage = data["memory"] server.cpu_usage = data["cpu"] server.service_url = service_url - server.ip = ip + server.ip = request.META["REMOTE_ADDR"] server.last_heartbeat = timezone.now() server.save() except JudgeServer.DoesNotExist: @@ -121,7 +117,7 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView): cpu_core=data["cpu_core"], memory_usage=data["memory"], cpu_usage=data["cpu"], - ip=ip, + ip=request.META["REMOTE_ADDR"], service_url=service_url, last_heartbeat=timezone.now(), )