From e67a21ed6a6558c1965c2973d6a0e066a7db66bc Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Sat, 18 Jun 2016 12:39:13 +0200 Subject: [PATCH 1/2] Add net.online to diag sys command Currently there was no sure way to check if node is in online or offline mode. License: MIT Signed-off-by: Jakub Sztandera --- core/commands/sysdiag.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go index 4ae37e2ee94..98b6ae76cb5 100644 --- a/core/commands/sysdiag.go +++ b/core/commands/sysdiag.go @@ -44,8 +44,13 @@ Prints out information about your computer to aid in easier debugging. res.SetError(err, cmds.ErrNormal) return } + node, err := req.InvocContext().GetNode() + if err != nil { + res.SetError(err, cmds.ErrNormal) + return + } - err = netInfo(info) + err = netInfo(node.OnlineMode(), info) if err != nil { res.SetError(err, cmds.ErrNormal) return @@ -117,7 +122,7 @@ func memInfo(out map[string]interface{}) error { return nil } -func netInfo(out map[string]interface{}) error { +func netInfo(online bool, out map[string]interface{}) error { n := make(map[string]interface{}) addrs, err := manet.InterfaceMultiaddrs() if err != nil { @@ -130,6 +135,7 @@ func netInfo(out map[string]interface{}) error { } n["interface_addresses"] = straddrs + n["online"] = online out["net"] = n return nil } From c10ed855a59980d9163fe7d3e9120648ecbb5074 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Sat, 18 Jun 2016 12:40:30 +0200 Subject: [PATCH 2/2] Add test for online field in diag sys License: MIT Signed-off-by: Jakub Sztandera --- test/sharness/t0151-sysdiag.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/sharness/t0151-sysdiag.sh b/test/sharness/t0151-sysdiag.sh index 1b0e4fe4e5a..a0a37831fc5 100755 --- a/test/sharness/t0151-sysdiag.sh +++ b/test/sharness/t0151-sysdiag.sh @@ -17,7 +17,8 @@ test_expect_success "ipfs diag sys succeeds" ' test_expect_success "output contains some expected keys" ' grep "virt" output && grep "interface_addresses" output && - grep "arch" output + grep "arch" output && + grep "online" output ' test_expect_success "uname succeeds" '