QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-12-28 16:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

git ip when service url is used

Browse Source
This commit is contained in:
virusdefender 2017-01-24 16:22:22 +08:00
parent 440d9c8430
commit 3f5f72a78d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/views.py
View File

@ -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(),
)