mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2025-11-04 14:49:58 +08:00
git ip when service url is used
This commit is contained in:
parent
440d9c8430
commit
3f5f72a78d
@ -100,10 +100,6 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView):
|
|||||||
if hashlib.sha256(token.encode("utf-8")).hexdigest() != judge_server_token:
|
if hashlib.sha256(token.encode("utf-8")).hexdigest() != judge_server_token:
|
||||||
return self.error("Invalid token")
|
return self.error("Invalid token")
|
||||||
service_url = data.get("service_url")
|
service_url = data.get("service_url")
|
||||||
if service_url:
|
|
||||||
ip = None
|
|
||||||
else:
|
|
||||||
ip = request.META["REMOTE_ADDR"]
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
server = JudgeServer.objects.get(hostname=data["hostname"])
|
server = JudgeServer.objects.get(hostname=data["hostname"])
|
||||||
@ -112,7 +108,7 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView):
|
|||||||
server.memory_usage = data["memory"]
|
server.memory_usage = data["memory"]
|
||||||
server.cpu_usage = data["cpu"]
|
server.cpu_usage = data["cpu"]
|
||||||
server.service_url = service_url
|
server.service_url = service_url
|
||||||
server.ip = ip
|
server.ip = request.META["REMOTE_ADDR"]
|
||||||
server.last_heartbeat = timezone.now()
|
server.last_heartbeat = timezone.now()
|
||||||
server.save()
|
server.save()
|
||||||
except JudgeServer.DoesNotExist:
|
except JudgeServer.DoesNotExist:
|
||||||
@ -121,7 +117,7 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView):
|
|||||||
cpu_core=data["cpu_core"],
|
cpu_core=data["cpu_core"],
|
||||||
memory_usage=data["memory"],
|
memory_usage=data["memory"],
|
||||||
cpu_usage=data["cpu"],
|
cpu_usage=data["cpu"],
|
||||||
ip=ip,
|
ip=request.META["REMOTE_ADDR"],
|
||||||
service_url=service_url,
|
service_url=service_url,
|
||||||
last_heartbeat=timezone.now(),
|
last_heartbeat=timezone.now(),
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user