diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:55:27 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:55:27 +0000 |
| commit | 9d8f798a3fa0a0a98626218ff1602bf06be0fb82 (patch) | |
| tree | 7226008bc691b4599c2c499de63c4bbced486a1b /synapse/http/client.py | |
| parent | Move bump schema delta (diff) | |
| parent | SYN-252: Supply the stream and topological parts in the correct order to the ... (diff) | |
| download | synapse-9d8f798a3fa0a0a98626218ff1602bf06be0fb82.tar.xz | |
Merge changes from develop
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 7793bab106..198f575cfa 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -63,6 +63,25 @@ class SimpleHttpClient(object): defer.returnValue(json.loads(body)) @defer.inlineCallbacks + def post_json_get_json(self, uri, post_json): + json_str = json.dumps(post_json) + + logger.info("HTTP POST %s -> %s", json_str, uri) + + response = yield self.agent.request( + "POST", + uri.encode("ascii"), + headers=Headers({ + "Content-Type": ["application/json"] + }), + bodyProducer=FileBodyProducer(StringIO(json_str)) + ) + + body = yield readBody(response) + + defer.returnValue(json.loads(body)) + + @defer.inlineCallbacks def get_json(self, uri, args={}): """ Get's some json from the given host and path |