From 300842a050dc07ef9a4f117f0dccbd0d30b39c94 Mon Sep 17 00:00:00 2001 From: virusdefender Date: Mon, 4 Dec 2017 22:19:15 +0800 Subject: [PATCH 1/2] fix ci --- oj/dev_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oj/dev_settings.py b/oj/dev_settings.py index 49d3f73..5c75a0b 100644 --- a/oj/dev_settings.py +++ b/oj/dev_settings.py @@ -7,7 +7,7 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'HOST': '127.0.0.1', - 'PORT': 5432, + 'PORT': 5433, 'NAME': "onlinejudge", 'USER': "onlinejudge", 'PASSWORD': 'onlinejudge' From 7c819ae208279440c4d508d163d802e23d19309f Mon Sep 17 00:00:00 2001 From: virusdefender Date: Wed, 6 Dec 2017 11:10:57 +0800 Subject: [PATCH 2/2] fix ip header --- conf/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/views.py b/conf/views.py index f09972c..5179243 100644 --- a/conf/views.py +++ b/conf/views.py @@ -95,7 +95,7 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView): server.memory_usage = data["memory"] server.cpu_usage = data["cpu"] server.service_url = service_url - server.ip = request.META["REMOTE_ADDR"] + server.ip = request.META["HTTP_X_REAL_IP"] server.last_heartbeat = timezone.now() server.save() except JudgeServer.DoesNotExist: