diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Concierge')
-rwxr-xr-x | OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py index f25ae9b..e5b1fd2 100755 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py +++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py | |||
@@ -29,6 +29,9 @@ | |||
29 | 29 | ||
30 | import logging | 30 | import logging |
31 | import BaseHTTPServer | 31 | import BaseHTTPServer |
32 | import xml.etree.ElementTree as ET | ||
33 | import xml.parsers.expat | ||
34 | |||
32 | 35 | ||
33 | # enable debug level logging | 36 | # enable debug level logging |
34 | logging.basicConfig(level = logging.DEBUG, | 37 | logging.basicConfig(level = logging.DEBUG, |
@@ -58,6 +61,13 @@ class ConciergeHandler(BaseHTTPServer.BaseHTTPRequestHandler): | |||
58 | 61 | ||
59 | self.logResponse(200) | 62 | self.logResponse(200) |
60 | 63 | ||
64 | def dumpXml(xml): | ||
65 | logging.debug('[ConciergeHandler] %s', xml.tag) | ||
66 | for attr in xml.attrib: | ||
67 | logging.debug('[ConciergeHandler] %s [%s] %s', xml.tag, attr, xml.attrib[attr]) | ||
68 | for kid in xml.getchildren: | ||
69 | dumpXml(kid) | ||
70 | |||
61 | def do_POST(self): | 71 | def do_POST(self): |
62 | self.logRequest() | 72 | self.logRequest() |
63 | hdrs = {} | 73 | hdrs = {} |
@@ -69,6 +79,13 @@ class ConciergeHandler(BaseHTTPServer.BaseHTTPRequestHandler): | |||
69 | self.rfile.close() | 79 | self.rfile.close() |
70 | 80 | ||
71 | logging.debug('[ConciergeHandler] POST: content: %s', content) | 81 | logging.debug('[ConciergeHandler] POST: content: %s', content) |
82 | try: | ||
83 | postXml = ET.parse(content) | ||
84 | dumpXml(postXml) | ||
85 | except xml.parsers.expat.ExpatError, xmlError: | ||
86 | logging.error('[ConciergeHandler] POST illformed:%s', xmlError) | ||
87 | self.send_response(500) | ||
88 | return | ||
72 | 89 | ||
73 | self.send_response(200) | 90 | self.send_response(200) |
74 | self.send_header('Content-type', 'text/html') | 91 | self.send_header('Content-type', 'text/html') |