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

Change from fnmatch to expr_match

Browse Source
This commit is contained in:
Joseph Hall 2016-07-15 15:35:23 -06:00
parent b656c48e94
commit 8be793b2ce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/thorium/reg.py
View File

@ -6,7 +6,7 @@ values are stored and computed, such as averages etc.
# import python libs
from __future__ import absolute_import, division
import fnmatch
import salt.utils
__func_alias__ = {
'set_': 'set',
@ -26,7 +26,7 @@ def set_(name, add, match):
__reg__[name] = {}
__reg__[name]['val'] = set()
for event in __events__:
if fnmatch.fnmatch(event['tag'], match):
if salt.utils.expr_match(event['tag'], match):
val = event['data']['data'].get(add)
if val is None:
val = 'None'
@ -61,7 +61,7 @@ def list_(name, add, match, stamp=False):
__reg__[name] = {}
__reg__[name]['val'] = []
for event in __events__:
if fnmatch.fnmatch(event['tag'], match):
if salt.utils.expr_match(event['tag'], match):
item = {}
for key in add:
if key in event['data']['data']:
@ -88,7 +88,7 @@ def mean(name, add, match):
__reg__[name]['total'] = 0
__reg__[name]['count'] = 0
for event in __events__:
if fnmatch.fnmatch(event['tag'], match):
if salt.utils.expr_match(event['tag'], match):
if add in event['data']['data']:
try:
comp = int(event['data']['data'])