Merge "Use CONF for oslo_config's cfg.CONF again"
This commit is contained in:
@@ -674,7 +674,7 @@ def timeline(records, **kwargs):
|
|||||||
|
|
||||||
@app.template_test()
|
@app.template_test()
|
||||||
def too_old(timestamp):
|
def too_old(timestamp):
|
||||||
age = cfg.CONF.age_warn
|
age = CONF.age_warn
|
||||||
now = time.time()
|
now = time.time()
|
||||||
return timestamp + age < now
|
return timestamp + age < now
|
||||||
|
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ def _session_request(session, uri, method):
|
|||||||
|
|
||||||
headers = {'User-Agent': user_agent, 'Accept': 'application/json'}
|
headers = {'User-Agent': user_agent, 'Accept': 'application/json'}
|
||||||
return session.request(method, uri, headers=headers,
|
return session.request(method, uri, headers=headers,
|
||||||
timeout=cfg.CONF.read_timeout)
|
timeout=CONF.read_timeout)
|
||||||
|
|
||||||
|
|
||||||
def do_request(uri, method='get', session=None):
|
def do_request(uri, method='get', session=None):
|
||||||
|
|||||||
Reference in New Issue
Block a user