valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimize list matcher by doing string membership checks,

Browse Source 
This is faster than splitting into a list and then iterating over it.
This commit is contained in:
Erik Johnson 2018-09-20 21:45:56 -05:00 committed by C. R. Oldham
parent 5ca3b9c424
commit 1593b58e3b
No known key found for this signature in database
GPG Key ID: 336DDBE4E260935A
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/matchers/list_match.py
View File

@ -1,17 +1,18 @@
# -*- coding: utf-8 -*-
'''
This is the default list matcher.
'''
from __future__ import absolute_import, print_function, unicode_literals
from salt.ext import six # pylint: disable=3rd-party-module-not-gated
def match(tgt):
'''
Determines if this host is on the list
'''
if isinstance(tgt, six.string_types):
tgt = tgt.split(',')
return bool(__opts__['id'] in tgt)
try:
return __opts__['id'] == tgt \
or ',' + __opts__['id'] + ',' in tgt \
or tgt.startswith(__opts__['id'] + ',') \
or tgt.endswith(',' + __opts__['id'])
except (AttributeError, TypeError):
return False