valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add user-agent to salt.utils.http

Browse Source
This commit is contained in:
Joseph Hall 2015-02-05 07:58:25 -07:00
parent 9bf6066ade
commit 637dc9610a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/utils/http.py
View File

@ -42,6 +42,7 @@ import salt.loader
import salt.config
from salt.template import compile_template
from salt import syspaths
from salt import version
# Import 3rd party libs
try:
@ -59,6 +60,7 @@ except ImportError:
log = logging.getLogger(__name__)
JARFILE = os.path.join(syspaths.CACHE_DIR, 'cookies.txt')
SESSIONJARFILE = os.path.join(syspaths.CACHE_DIR, 'cookies.session.p')
USERAGENT = 'Salt/{0}'.format(salt.version.__version__)
def query(url,
@ -100,6 +102,7 @@ def query(url,
decode_out=None,
stream=False,
handle=False,
agent=USERAGENT,
**kwargs):
'''
Query a resource, and decode the return data
@ -209,6 +212,10 @@ def query(url,
else:
sess_cookies.load()
if agent == USERAGENT:
agent = '{0} http.query()'.format(agent)
header_dict['User-agent'] = agent
if test is True:
if test_url is None:
return {}