Browse Source

change from 'weed tail' to 'weed watch'

pull/1287/head
Chris Lu 5 years ago
parent
commit
af1f64d244
  1. 2
      weed/command/command.go
  2. 22
      weed/command/watch.go

2
weed/command/command.go

@ -24,7 +24,7 @@ var Commands = []*Command{
cmdScaffold, cmdScaffold,
cmdServer, cmdServer,
cmdShell, cmdShell,
cmdTail,
cmdWatch,
cmdUpload, cmdUpload,
cmdVersion, cmdVersion,
cmdVolume, cmdVolume,

22
weed/command/tail.go → weed/command/watch.go

@ -12,11 +12,11 @@ import (
) )
func init() { func init() {
cmdTail.Run = runTail // break init cycle
cmdWatch.Run = runWatch // break init cycle
} }
var cmdTail = &Command{
UsageLine: "tail <wip> [-filer=localhost:8888]",
var cmdWatch = &Command{
UsageLine: "watch <wip> [-filer=localhost:8888] [-target=/]",
Short: "see recent changes on a filer", Short: "see recent changes on a filer",
Long: `See recent changes on a filer. Long: `See recent changes on a filer.
@ -24,19 +24,19 @@ var cmdTail = &Command{
} }
var ( var (
tailFiler = cmdTail.Flag.String("filer", "localhost:8888", "filer hostname:port")
tailTarget = cmdTail.Flag.String("target", "/", "a folder or file on filer")
watchFiler = cmdWatch.Flag.String("filer", "localhost:8888", "filer hostname:port")
watchTarget = cmdWatch.Flag.String("target", "/", "a folder or file on filer")
) )
func runTail(cmd *Command, args []string) bool {
func runWatch(cmd *Command, args []string) bool {
grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client") grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")
tailErr := pb.WithFilerClient(*tailFiler, grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
watchErr := pb.WithFilerClient(*watchFiler, grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
stream, err := client.ListenForEvents(context.Background(), &filer_pb.ListenForEventsRequest{ stream, err := client.ListenForEvents(context.Background(), &filer_pb.ListenForEventsRequest{
ClientName: "tail",
Directory: *tailTarget,
ClientName: "watch",
Directory: *watchTarget,
SinceNs: 0, SinceNs: 0,
}) })
if err != nil { if err != nil {
@ -55,8 +55,8 @@ func runTail(cmd *Command, args []string) bool {
} }
}) })
if tailErr != nil {
fmt.Printf("tail %s: %v\n", *tailFiler, tailErr)
if watchErr != nil {
fmt.Printf("watch %s: %v\n", *watchFiler, watchErr)
} }
return true return true
Loading…
Cancel
Save