Skip to content

lightningd/plugin: fix plugins->startup member at lightning startup #2996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rustyrussell merged 1 commit into from Aug 27, 2019
Merged

lightningd/plugin: fix plugins->startup member at lightning startup #2996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lightningd/plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,8 +1017,6 @@ void plugins_init(struct plugins *plugins, const char *dev_plugin_debug)

if (plugins->pending_manifests > 0)
io_loop_with_timers(plugins->ld);
// There won't be io_loop anymore to wait for plugins
plugins->startup = false;
}

static void plugin_config_cb(const char *buffer,
Expand Down Expand Up @@ -1072,6 +1070,8 @@ void plugins_config(struct plugins *plugins)
plugin_config(p);
}
}

plugins->startup = false;
}

void json_add_opt_plugins(struct json_stream *response,
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/dblog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def init(configuration, options, plugin):
plugin.conn.execute(c)
plugin.log("{}".format(c))
plugin.initted = True
plugin.log("initialized")
plugin.log("initialized {}".format(configuration))


@plugin.hook('db_write')
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/slow_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

@plugin.init()
def init(options, configuration, plugin):
plugin.log("slow_init.py initializing")
plugin.log("slow_init.py initializing {}".format(configuration))
time.sleep(1)


Expand Down
4 changes: 2 additions & 2 deletions tests/test_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def test_plugin_slowinit(node_factory):
n = node_factory.get_node()

n.rpc.plugin_start(os.path.join(os.getcwd(), "tests/plugins/slow_init.py"))
n.daemon.wait_for_log("slow_init.py initializing")
n.daemon.wait_for_log("slow_init.py initializing.* 'startup': False")

# It's not actually configured yet, see what happens;
# make sure 'rescan' and 'list' controls dont crash
Expand Down Expand Up @@ -304,7 +304,7 @@ def test_db_hook(node_factory, executor):
l1.daemon.wait_for_log('plugin-dblog.py replaying pre-init data:')
l1.daemon.wait_for_log('plugin-dblog.py PRAGMA foreign_keys = ON;')
l1.daemon.wait_for_log('plugin-dblog.py CREATE TABLE version \\(version INTEGER\\)')
l1.daemon.wait_for_log('plugin-dblog.py initialized')
l1.daemon.wait_for_log("plugin-dblog.py initialized.* 'startup': True")

l1.stop()

Expand Down