mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 18:11:28 +01:00
Code Issues Projects Releases Wiki Activity

pylightning: reduce scope for deadlock in plugins.

Browse Source 
If we can't marshall an object into JSON, the exception causes a deadlock
and we don't get any results.

Instead of deadlocking, our failure now is:

	lightning.lightning.RpcError: RPC call failed: method: echo, payload: {'msat': 17msat}, error: Error while processing echo: TypeError("Object of type 'Millisatoshi' is not JSON serializable",)

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-02-25 14:45:56 +10:30
parent c7316d7ba2
commit 464858883b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/pylightning/lightning/plugin.py
View File

@ -83,10 +83,7 @@ class Request(dict):
})
def _write_result(self, result):
with self.plugin.write_lock:
json.dump(result, fp=self.plugin.stdout)
self.plugin.stdout.write('\n\n')
self.plugin.stdout.flush()
self.plugin._write_locked(result)
class Plugin(object):
@ -373,16 +370,19 @@ class Plugin(object):
except Exception:
self.log(traceback.format_exc())
def _write_locked(self, obj):
s = json.dumps(obj) + "\n\n"
with self.write_lock:
self.stdout.write(s)
self.stdout.flush()
def notify(self, method, params):
payload = {
'jsonrpc': '2.0',
'method': method,
'params': params,
}
with self.write_lock:
json.dump(payload, self.stdout)
self.stdout.write("\n\n")
self.stdout.flush()
self._write_locked(payload)
def log(self, message, level='info'):
# Split the log into multiple lines and print them