fix(cmd/diag): inorder output
License: MIT Signed-off-by: Overbool <overbool.xu@gmail.com>
Overbool committed
Oct 27, 2018 at 00:55 UTC
d26f97a90293bfea1db208eb3f7d8077297311c2
4 files changed
+17
-9
core/commands/active.go
+12
-4
@@ -1,6 +1,7 @@
1
package commands
2
3
import (
4
+ "bytes"
5
"fmt"
6
"io"
7
"sort"
@@ -8,7 +9,8 @@ import (
9
"time"
10
11
oldcmds "github.com/ipfs/go-ipfs/commands"
11
- cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds"
12
+
13
+ cmds "gx/ipfs/QmdTmGruUz23vgzym3uWpnAEQdGdGifQqBvP8UXSRjG8gZ/go-ipfs-cmds"
14
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
15
)
16
@@ -38,7 +40,9 @@ Lists running and recently run commands.
40
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *[]*cmds.ReqLogEntry) error {
41
verbose, _ := req.Options[verboseOptionName].(bool)
42
41
- tw := tabwriter.NewWriter(w, 4, 4, 2, ' ', 0)
43
+ buf := new(bytes.Buffer)
44
+
45
+ tw := tabwriter.NewWriter(buf, 4, 4, 2, ' ', 0)
46
if verbose {
47
fmt.Fprint(tw, "ID\t")
48
}
@@ -74,9 +78,13 @@ Lists running and recently run commands.
78
live = req.EndTime.Sub(req.StartTime)
79
}
80
t := req.StartTime.Format(time.Stamp)
77
- fmt.Fprintf(w, "%t\t%s\t%s\n", req.Active, t, live)
81
+ fmt.Fprintf(tw, "%t\t%s\t%s\n", req.Active, t, live)
82
}
79
- return tw.Flush()
83
+ tw.Flush()
84
+
85
+ fmt.Fprint(w, buf)
86
+
87
+ return nil
88
}),
89
},
90
Type: []*cmds.ReqLogEntry{},
core/commands/diag.go
+1
-1
@@ -1,7 +1,7 @@
1
package commands
2
3
import (
4
- cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds"
4
+ cmds "gx/ipfs/QmdTmGruUz23vgzym3uWpnAEQdGdGifQqBvP8UXSRjG8gZ/go-ipfs-cmds"
5
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
6
)
7
core/commands/mount_nofuse.go
+1
-1
@@ -3,7 +3,7 @@
3
package commands
4
5
import (
6
- cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds"
6
+ cmds "gx/ipfs/QmdTmGruUz23vgzym3uWpnAEQdGdGifQqBvP8UXSRjG8gZ/go-ipfs-cmds"
7
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
8
)
9
core/commands/mount_windows.go
+3
-3
@@ -3,7 +3,7 @@ package commands
3
import (
4
"errors"
5
6
- cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds"
6
+ cmds "gx/ipfs/QmdTmGruUz23vgzym3uWpnAEQdGdGifQqBvP8UXSRjG8gZ/go-ipfs-cmds"
7
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
8
)
9
@@ -13,7 +13,7 @@ var MountCmd = &cmds.Command{
13
ShortDescription: "Not yet implemented on Windows. :(",
14
},
15
16
- Run: func(req cmds.Request, res cmds.Response) {
17
- res.SetError(errors.New("Mount isn't compatible with Windows yet"), cmdkit.ErrNormal)
16
+ Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
17
+ return errors.New("Mount isn't compatible with Windows yet")
18
},
19
}