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

Add server/protocol type to rpcserver logs

Browse Source 
Add the server class name, such as [xmlserver] or [jsonserver_kerb] to
the server logs. This will allow easier debugging of problems specific
to a protocol or server class.
This commit is contained in:
Petr Viktorin 2013-04-17 12:19:15 +02:00
parent 6839d8334e
commit 73b8047b22
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ipaserver/rpcserver.py
View File

@ -308,6 +308,7 @@ class WSGIExecutioner(Executioner):
args = () args = ()
options = {} options = {}
e = None
if not 'HTTP_REFERER' in environ: if not 'HTTP_REFERER' in environ:
return self.marshal(result, RefererError(referer='missing'), _id) return self.marshal(result, RefererError(referer='missing'), _id)
if not environ['HTTP_REFERER'].startswith('https://%s/ipa' % self.api.env.host) and not self.env.in_tree: if not environ['HTTP_REFERER'].startswith('https://%s/ipa' % self.api.env.host) and not self.env.in_tree:
@ -342,6 +343,8 @@ class WSGIExecutioner(Executioner):
error = InternalError() error = InternalError()
finally: finally:
os.environ['LANG'] = lang os.environ['LANG'] = lang
principal = getattr(context, 'principal', 'UNKNOWN')
if name and name in self.Command: if name and name in self.Command:
try: try:
params = self.Command[name].args_options_2_params(*args, **options) params = self.Command[name].args_options_2_params(*args, **options)
@ -351,13 +354,23 @@ class WSGIExecutioner(Executioner):
) )
# get at least some context of what is going on # get at least some context of what is going on
params = options params = options
principal = getattr(context, 'principal', 'UNKNOWN')
if error: if error:
self.info('%s: %s(%s): %s', principal, name, ', '.join(self.Command[name]._repr_iter(**params)), e.__class__.__name__) result_string = type(e).__name__
else: else:
self.info('%s: %s(%s): SUCCESS', principal, name, ', '.join(self.Command[name]._repr_iter(**params))) result_string = 'SUCCESS'
self.info('[%s] %s: %s(%s): %s',
type(self).__name__,
principal,
name,
', '.join(self.Command[name]._repr_iter(**params)),
result_string)
else: else:
self.info('%s: %s', context.principal, e.__class__.__name__) self.info('[%s] %s: %s: %s',
type(self).__name__,
principal,
name,
type(e).__name__)
return self.marshal(result, error, _id) return self.marshal(result, error, _id)
def simple_unmarshal(self, environ): def simple_unmarshal(self, environ):