Ack for all patches, Reviewed. / Srikanth
----- [email protected] wrote: > python/pyosaf/utils/__init__.py | 2 +- > python/pyosaf/utils/immom/__init__.py | 3 --- > python/pyosaf/utils/immom/ccb.py | 2 -- > python/pyosaf/utils/immom/iterator.py | 2 -- > 4 files changed, 1 insertions(+), 8 deletions(-) > > > The previous behavior, before changing callers to use decorated > functions, was to use 60 retries and this was mistakenly changed in a > previous patch. > > diff --git a/python/pyosaf/utils/__init__.py > b/python/pyosaf/utils/__init__.py > --- a/python/pyosaf/utils/__init__.py > +++ b/python/pyosaf/utils/__init__.py > @@ -19,7 +19,7 @@ import time > > from pyosaf.saAis import eSaAisErrorT > > -TRY_AGAIN_COUNT = 30 > +TRY_AGAIN_COUNT = 60 > > class SafException(Exception): > ''' SAF Exception that can be printed ''' > diff --git a/python/pyosaf/utils/immom/__init__.py > b/python/pyosaf/utils/immom/__init__.py > --- a/python/pyosaf/utils/immom/__init__.py > +++ b/python/pyosaf/utils/immom/__init__.py > @@ -39,8 +39,6 @@ from pyosaf.utils.immom.object import Im > HANDLE = saImmOm.SaImmHandleT() > ACCESSOR_HANDLE = SaImmAccessorHandleT() > > -TRYAGAIN_CNT = 60 > - > # Decorate IMM functions to add retry loops and error handling > saImmOmInitialize = decorate(saImmOm.saImmOmInitialize) > saImmOmSelectionObjectGet = > decorate(saImmOm.saImmOmSelectionObjectGet) > @@ -79,7 +77,6 @@ def _initialize(): > > err = saImmOmInitialize(HANDLE, None, version) > > - # TODO TRYAGAIN handling? Is it needed? > err = saImmOmAccessorInitialize(HANDLE, ACCESSOR_HANDLE) > > > diff --git a/python/pyosaf/utils/immom/ccb.py > b/python/pyosaf/utils/immom/ccb.py > --- a/python/pyosaf/utils/immom/ccb.py > +++ b/python/pyosaf/utils/immom/ccb.py > @@ -35,8 +35,6 @@ from pyosaf import saAis > from pyosaf.utils import immom > from pyosaf.utils import SafException > > -TRYAGAIN_CNT = 60 > - > def _value_to_ctype_ptr(value_type, value): > ''' convert a value to a ctypes value ptr ''' > if value_type is eSaImmValueTypeT.SA_IMM_ATTR_SAINT32T: > diff --git a/python/pyosaf/utils/immom/iterator.py > b/python/pyosaf/utils/immom/iterator.py > --- a/python/pyosaf/utils/immom/iterator.py > +++ b/python/pyosaf/utils/immom/iterator.py > @@ -35,8 +35,6 @@ from pyosaf.utils import immom > from pyosaf.utils import SafException > from pyosaf.utils.immom.object import ImmObject > > -TRYAGAIN_CNT = 60 > - > > class SearchIterator(collections.Iterator): > ''' general search iterator ''' ------------------------------------------------------------------------------ _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
