From e93c8ef275be27f8dd6073e75c0f28b0af75555e Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 20 Sep 2013 14:00:46 -0500 Subject: [PATCH] Use teuthology.config. Also use os.path.join() --- teuthology/lockstatus.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/teuthology/lockstatus.py b/teuthology/lockstatus.py index 5c25479efc766..44821cc4ca8ee 100644 --- a/teuthology/lockstatus.py +++ b/teuthology/lockstatus.py @@ -1,15 +1,12 @@ import json import httplib2 import logging +import os +from .config import config log = logging.getLogger(__name__) -def _lock_url(ctx): - try: - return ctx.teuthology_config['lock_server'] - except (AttributeError, KeyError): - return "http://teuthology.front.sepia.ceph.com/locker/lock" - + def send_request(method, url, body=None, headers=None): http = httplib2.Http() resp, content = http.request(url, method=method, body=body, headers=headers) @@ -19,8 +16,9 @@ def send_request(method, url, body=None, headers=None): method, url, body, resp.status) return (False, None, resp.status) + def get_status(ctx, name): - success, content, _ = send_request('GET', _lock_url(ctx) + '/' + name) + success, content, _ = send_request('GET', os.path.join(config.lock_server, name)) if success: return json.loads(content) return None -- 2.39.5