IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Log each command in a batch separately.

Browse Source 
This also fixes command logging in general, it wasn't working in most
cases as a regression in ticket 1322.

https://fedorahosted.org/freeipa/ticket/1598
This commit is contained in:
Rob Crittenden
2011-08-19 16:20:01 -04:00
parent 159c13a550
commit 4797cddbd0
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ipalib/plugins/batch.py
View File

@@ -51,6 +51,7 @@ from ipalib import Str, List
from ipalib.output import Output
from ipalib import output
from ipalib.text import _
from ipalib.request import context
from ipapython.version import API_VERSION
class batch(Command):
@@ -81,17 +82,40 @@ class batch(Command):
def execute(self, *args, **options):
results=[]
for arg in args[0]:
params = dict()
name = None
try:
if 'method' not in arg:
raise errors.RequirementError(name='method')
if 'params' not in arg:
raise errors.RequirementError(name='params')
name = arg['method']
if name not in self.Command:
raise errors.CommandError(name=name)
a = arg['params'][0]
kw = arg['params'][1]
newkw = {}
for k in kw:
newkw[str(k)] = kw[k]
result = api.Command[arg['method']](*a, **newkw)
params = api.Command[name].args_options_2_params(*a, **newkw)
result = api.Command[name](*a, **newkw)
self.info(
'batch: %s(%s): SUCCESS', name, ', '.join(api.Command[name]._repr_iter(**params))
)
result['error']=None
except Exception, e:
result = dict()
result['error'] = unicode(e)
if isinstance(e, errors.RequirementError) or \
isinstance(e, errors.CommandError):
self.info(
'%s: batch: %s', context.principal, e.__class__.__name__
)
else:
self.info(
'%s: batch: %s(%s): %s', context.principal, name, ', '.join(api.Command[name]._repr_iter(**params)), e.__class__.__name__
)
results.append(result)
return dict(count=len(results) , results=results)

7
ipaserver/rpcserver.py
View File

@@ -195,6 +195,9 @@ class WSGIExecutioner(Executioner):
error = None
_id = None
lang = os.environ['LANG']
name = None
args = ()
options = {}
if not 'KRB5CCNAME' in environ:
return self.marshal(result, CCacheError(), _id)
try:
@@ -227,12 +230,14 @@ class WSGIExecutioner(Executioner):
error = InternalError()
finally:
os.environ['LANG'] = lang
if error is None:
if name:
params = self.Command[name].args_options_2_params(*args, **options)
if error:
self.info('%s: %s(%s): %s', context.principal, name, ', '.join(self.Command[name]._repr_iter(**params)), e.__class__.__name__)
else:
self.info('%s: %s(%s): SUCCESS', context.principal, name, ', '.join(self.Command[name]._repr_iter(**params)))
else:
self.info('%s: %s', context.principal, e.__class__.__name__)
return self.marshal(result, error, _id)
def simple_unmarshal(self, environ):