chiark
/
gitweb
/
~ian
/
hippotat.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip debug
[hippotat.git]
/
server
diff --git
a/server
b/server
index 19a04d2b55a93d1a0e50b413e5d4b8f0089f78a3..68f854148152d69ab01074407cc55276b982d4ab 100755
(executable)
--- a/
server
+++ b/
server
@@
-137,9
+137,9
@@
class Client():
def process_request(request, desca):
# find client, update config, etc.
metadata = request.args['m']
def process_request(request, desca):
# find client, update config, etc.
metadata = request.args['m']
- metadata = metadata.split(b'\n')
- (ci_s, pw, tro) = metadata
.split(b'\n')
[0:3]
- desca['m'] = [ci_s, tro]
+ metadata = metadata.split(b'\
r\
n')
+ (ci_s, pw, tro) = metadata[0:3]
+ desca['m
[0,2]
'] = [ci_s, tro]
ci = ipaddr(ci_s)
desca['ci'] = ci
cl = clients[ci]
ci = ipaddr(ci_s)
desca['ci'] = ci
cl = clients[ci]
@@
-168,14
+168,17
@@
def log_http(desca, msg):
class IphttpResource(twisted.web.resource.Resource):
isLeaf = True
def render_POST(self, request):
class IphttpResource(twisted.web.resource.Resource):
isLeaf = True
def render_POST(self, request):
+ log_debug(DBG.HTTP_FULL,
+ 'req recv: ' + repr(request) + ' ' + repr(request.args),
+ idof=id(request))
desca = {'d': None}
try: process_request(request, desca)
except Exception as e:
desca = {'d': None}
try: process_request(request, desca)
except Exception as e:
- emsg =
str(e).encode('utf-8'
)
+ emsg =
repr(e
)
log_http(desca, 'EXCEPTION ' + emsg)
request.setHeader('Content-Type','text/plain; charset="utf-8"')
request.setResponseCode(400)
log_http(desca, 'EXCEPTION ' + emsg)
request.setHeader('Content-Type','text/plain; charset="utf-8"')
request.setResponseCode(400)
- return emsg
+ return emsg
.encode('utf-8')
log_http(desca, '... [%s]' % id(request))
return NOT_DONE_YET
log_http(desca, '... [%s]' % id(request))
return NOT_DONE_YET