From 65c96739c991ccaed9c3b657e8e87786604f9629 Mon Sep 17 00:00:00 2001 From: virusdefender Date: Wed, 6 Dec 2017 11:50:15 +0800 Subject: [PATCH] fix token name --- docker-compose.example.yml | 8 ++++---- server/service.py | 4 ++-- server/utils.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.example.yml b/docker-compose.example.yml index 18dc424..4d15552 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -1,4 +1,4 @@ -version: "2" +version: "3" services: judge_server: image: registry.cn-hangzhou.aliyuncs.com/onlinejudge/judge_server @@ -16,11 +16,11 @@ services: - /spj:exec,mode=777 volumes: - $PWD/tests/test_case:/test_case:ro - - /data/log:/log + - $PWD/log:/log - $PWD/server:/code:ro environment: - - backend_url=http://backend:8000/api/judge_server_heartbeat - - service_url=http://judge-server:12358 + - BACKEND_URL=http://backend:8000/api/judge_server_heartbeat + - SERVICE_URL=http://judge-server:12358 - TOKEN=YOUR_TOKEN_HERE ports: - "0.0.0.0:12358:8080" diff --git a/server/service.py b/server/service.py index f3915db..c6d25cd 100644 --- a/server/service.py +++ b/server/service.py @@ -11,8 +11,8 @@ from utils import server_info, logger, token class JudgeService(object): def __init__(self): - self.service_url = os.environ["service_url"] - self.backend_url = os.environ["backend_url"] + self.service_url = os.environ["SERVICE_URL"] + self.backend_url = os.environ["BACKEND_URL"] def _request(self, data): try: diff --git a/server/utils.py b/server/utils.py index ded9977..a5412f5 100644 --- a/server/utils.py +++ b/server/utils.py @@ -32,7 +32,7 @@ def get_token(): if token: return token else: - raise JudgeClientError("ENV TOKEN not found") + raise JudgeClientError("env 'token' not found") token = hashlib.sha256(get_token()).hexdigest()