Skip to content

Commit 17c2cea

Browse files
laanwjknst
authored andcommitted
Merge bitcoin#20884: script: Improve robustness of bitcoind.service on startup
9d02654 doc: Fix systemd spelling and link to doc/init.md (Hennadii Stepanov) 601778c script: Add Documentation key to bitcoind.service (Hennadii Stepanov) d9392b7 script: Improve robustness of bitcoind.service on startup (Hennadii Stepanov) Pull request description: If network interfaces are not properly up the following happens: ``` ... 2021-01-08T10:17:11Z scheduler thread start 2021-01-08T10:17:11Z libevent: getaddrinfo: address family for nodename not supported 2021-01-08T10:17:11Z Binding RPC on address 127.0.0.1 port 8332 failed. 2021-01-08T10:17:11Z HTTP: creating work queue of depth 16 2021-01-08T10:17:11Z Using random cookie authentication. 2021-01-08T10:17:11Z Generated RPC authentication cookie /var/lib/bitcoind/.cookie 2021-01-08T10:17:11Z HTTP: starting 2 worker threads 2021-01-08T10:17:11Z init message: Loading banlist... 2021-01-08T10:17:11Z SetNetworkActive: true 2021-01-08T10:17:11Z Error: Cannot resolve -externalip address: <EDITED> 2021-01-08T10:17:11Z Shutdown: In progress... 2021-01-08T10:17:11Z scheduler thread exit 2021-01-08T10:17:11Z Shutdown: done ``` This PR improves robustness on startup in such cases in documented way: https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/ Also minor doc improvements are added. ACKs for top commit: Sjors: ACK 9d02654 practicalswift: ACK 9d02654: patch looks correct darosior: ACK 9d02654 -- been using the first patch too Tree-SHA512: 38294f5682c09e6ea9008de7d7459098c920cf1b98ad8ef8a5d2ca01f2f781c0fec5591dc40ef36eeb19d94991b0c7fb7cb38c4e716bc7219875c9bcd0a55e1b
1 parent 9942685 commit 17c2cea

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

contrib/init/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Sample configuration files for:
22
```
3-
SystemD: dashd.service
3+
systemd: dashd.service
44
Upstart: dashd.conf
55
OpenRC: dashd.openrc
66
dashd.openrcconf
@@ -9,4 +9,4 @@ macOS: org.dash.dashd.plist
99
```
1010
have been made available to assist packagers in creating node packages here.
1111

12-
See doc/init.md for more information.
12+
See [doc/init.md](../../doc/init.md) for more information.

contrib/init/dashd.service

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111

1212
[Unit]
1313
Description=Dash daemon
14-
After=network.target
14+
Documentation=https://github.com/dashpay/dash/blob/master/doc/init.md
15+
16+
# https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
17+
After=network-online.target
18+
Wants=network-online.target
1519

1620
[Service]
1721
ExecStart=/usr/bin/dashd -daemon \

0 commit comments

Comments
 (0)