nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #628: daemon bin: remove help detection on the command line

Browse Source 
7ecefdebdfaa8cc6e4641615009c03d6f1b07941 Revert "tests: don't wait for lianad to log on shutdown" (Antoine Poinsot)
77e46d549567dc3ee8d85a93bc8ac4531aaa7817 daemon: remove 'help' detection in command line arguments (Antoine Poinsot)

Pull request description:

ACKs for top commit:
  darosior:
    ACK 7ecefdebdfaa8cc6e4641615009c03d6f1b07941 -- tested by running the whole test suite 20 times in parallel locally.

Tree-SHA512: 03d4aef6b7d1ffdeda8987f015465fe1060cab8e17dbf40825760d455f01ebd83602b9a5b804452b1dcc01022e515653e2d68b504837b2c46a00d1ae106ad50e
This commit is contained in:
Antoine Poinsot 2023-08-22 16:48:52 +02:00
commit 0f8af27ee5
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/daemon.rs
View File

@ -19,10 +19,7 @@ fn parse_args(args: Vec<String>) -> Option<PathBuf> {
return None; return None;
} }
let is_help = args if args.len() != 3 {
.iter()
.any(|arg| arg.contains("help") || arg.contains("-h"));
if args.len() != 3 || is_help {
print_help_exit(); print_help_exit();
} }

3
tests/test_framework/lianad.py
View File

@ -127,6 +127,9 @@ class Lianad(TailableProc):
def stop(self, timeout=5): def stop(self, timeout=5):
try: try:
self.rpc.stop() self.rpc.stop()
self.wait_for_log(
"Stopping the liana daemon.",
)
self.proc.wait(timeout) self.proc.wait(timeout)
except Exception as e: except Exception as e:
logging.error(f"{self.prefix} : error when calling stop: '{e}'") logging.error(f"{self.prefix} : error when calling stop: '{e}'")