summaryrefslogtreecommitdiffstats
path: root/filter_plugins
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-04-11 16:43:05 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-04-20 15:10:51 -0300
commitb0e43e87b132594bc370419085000b6d6c54cdc6 (patch)
tree1f7e1238e4ef544e579d3774a0a8ac6bee41a6db /filter_plugins
parent895a55c23fb7ae202ed3d6b4660f5e37410b05f2 (diff)
downloadopenshift-b0e43e87b132594bc370419085000b6d6c54cdc6.tar.gz
openshift-b0e43e87b132594bc370419085000b6d6c54cdc6.tar.bz2
openshift-b0e43e87b132594bc370419085000b6d6c54cdc6.tar.xz
openshift-b0e43e87b132594bc370419085000b6d6c54cdc6.zip
Use a JSON list for docker log options.
Previously we expected you to comma separate, but this wasn't really clear. Insted we will use an explicit JSON list going forward. The comma separated list will be supported for backwards compatability.
Diffstat (limited to 'filter_plugins')
-rw-r--r--filter_plugins/oo_filters.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py
index 57c14e9a3..3da4562ac 100644
--- a/filter_plugins/oo_filters.py
+++ b/filter_plugins/oo_filters.py
@@ -259,8 +259,11 @@ class FilterModule(object):
@staticmethod
def oo_split(string, separator=','):
- """ This splits the input string into a list
+ """ This splits the input string into a list. If the input string is
+ already a list we will return it as is.
"""
+ if isinstance(string, list):
+ return string
return string.split(separator)
@staticmethod