aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

plugin: Added .params.configuration to init call

Browse Source 
This tells the plugin both the `lightning-dir` as well as the
`rpc-filename` to use to talk to `lightningd`. Prior to this they'd
had to guess.

Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker
2018-12-06 12:30:10 +01:00
parent 5b6bb7c571
commit be7674ed6c
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/plugins/helloworld.py
View File

@@ -45,7 +45,7 @@ def json_getmanifest(request):
} }
def json_init(request, options): def json_init(request, options, configuration):
"""The main daemon is telling us the relevant cli options """The main daemon is telling us the relevant cli options
""" """
global greeting global greeting

2
lightningd/lightningd.c
View File

@@ -214,7 +214,7 @@ static struct lightningd *new_lightningd(const tal_t *ctx)
*code. Here we initialize the context that will keep track and control *code. Here we initialize the context that will keep track and control
*the plugins. *the plugins.
*/ */
ld->plugins = plugins_new(ld, ld->log_book, ld->jsonrpc); ld->plugins = plugins_new(ld, ld->log_book, ld->jsonrpc, ld);
return ld; return ld;
} }

11
lightningd/plugin.c
View File

@@ -90,6 +90,7 @@ struct plugins {
struct jsonrpc *rpc; struct jsonrpc *rpc;
struct timers timers; struct timers timers;
struct lightningd *ld;
}; };
/* Represents a pending JSON-RPC request that was forwarded to a /* Represents a pending JSON-RPC request that was forwarded to a
@@ -116,7 +117,7 @@ struct plugin_opt {
}; };
struct plugins *plugins_new(const tal_t *ctx, struct log_book *log_book, struct plugins *plugins_new(const tal_t *ctx, struct log_book *log_book,
struct jsonrpc *rpc) struct jsonrpc *rpc, struct lightningd *ld)
{ {
struct plugins *p; struct plugins *p;
p = tal(ctx, struct plugins); p = tal(ctx, struct plugins);
@@ -125,6 +126,7 @@ struct plugins *plugins_new(const tal_t *ctx, struct log_book *log_book,
p->log = new_log(p, log_book, "plugin-manager"); p->log = new_log(p, log_book, "plugin-manager");
p->rpc = rpc; p->rpc = rpc;
timers_init(&p->timers, time_mono()); timers_init(&p->timers, time_mono());
p->ld = ld;
return p; return p;
} }
@@ -825,6 +827,7 @@ static void plugin_config(struct plugin *plugin)
struct plugin_opt *opt; struct plugin_opt *opt;
const char *name; const char *name;
struct plugin_request *req; struct plugin_request *req;
struct lightningd *ld = plugin->plugins->ld;
/* No writer since we don't flush concurrently. */ /* No writer since we don't flush concurrently. */
req = plugin_request_new(plugin, "init", plugin_config_cb, plugin); req = plugin_request_new(plugin, "init", plugin_config_cb, plugin);
@@ -839,6 +842,12 @@ static void plugin_config(struct plugin *plugin)
} }
json_object_end(req->stream); /* end of .params.options */ json_object_end(req->stream); /* end of .params.options */
/* Add .params.configuration */
json_object_start(req->stream, "configuration");
json_add_string(req->stream, "lightning-dir", ld->config_dir);
json_add_string(req->stream, "rpc-file", ld->rpc_filename);
json_object_end(req->stream);
json_object_end(req->stream); /* end of .params */ json_object_end(req->stream); /* end of .params */
plugin_request_queue(req); plugin_request_queue(req);

2
lightningd/plugin.h
View File

@@ -17,7 +17,7 @@ struct plugins;
* Create a new plugins context. * Create a new plugins context.
*/ */
struct plugins *plugins_new(const tal_t *ctx, struct log_book *log_book, struct plugins *plugins_new(const tal_t *ctx, struct log_book *log_book,
struct jsonrpc *rpc); struct jsonrpc *rpc, struct lightningd *ld);
/** /**
* Initialize the registered plugins. * Initialize the registered plugins.

2
lightningd/test/run-find_my_abspath.c
View File

@@ -140,7 +140,7 @@ void plugins_init(struct plugins *plugins UNNEEDED)
{ fprintf(stderr, "plugins_init called!\n"); abort(); } { fprintf(stderr, "plugins_init called!\n"); abort(); }
/* Generated stub for plugins_new */ /* Generated stub for plugins_new */
struct plugins *plugins_new(const tal_t *ctx UNNEEDED, struct log_book *log_book UNNEEDED, struct plugins *plugins_new(const tal_t *ctx UNNEEDED, struct log_book *log_book UNNEEDED,
struct jsonrpc *rpc UNNEEDED) struct jsonrpc *rpc UNNEEDED, struct lightningd *ld UNNEEDED)
{ fprintf(stderr, "plugins_new called!\n"); abort(); } { fprintf(stderr, "plugins_new called!\n"); abort(); }
/* Generated stub for register_opts */ /* Generated stub for register_opts */
void register_opts(struct lightningd *ld UNNEEDED) void register_opts(struct lightningd *ld UNNEEDED)