Merge branch 'master' into mq-subscribe

2 files changed, 53 insertions, 19 deletions

diff --git a/weed/shell/command_fs_log.go b/weed/shell/command_fs_log.go
new file mode 100644
index 000000000..5567f76e6
--- /dev/null
+++ b/weed/shell/command_fs_log.go
@@ -0,0 +1,53 @@
+package shell
+
+import (
+	"flag"
+	"fmt"
+	"github.com/seaweedfs/seaweedfs/weed/filer"
+	"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
+	"io"
+	"time"
+)
+
+func init() {
+	Commands = append(Commands, &commandFsLogPurge{})
+}
+
+type commandFsLogPurge struct {
+}
+
+func (c *commandFsLogPurge) Name() string {
+	return "fs.log.purge"
+}
+
+func (c *commandFsLogPurge) Help() string {
+	return `purge filer logs
+
+	fs.log.purge [-v] [-modifyDayAgo 365]
+`
+}
+
+func (c *commandFsLogPurge) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
+	fsLogPurgeCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
+	daysAgo := fsLogPurgeCommand.Uint("daysAgo", 365, "purge logs older than N days")
+	verbose := fsLogPurgeCommand.Bool("v", false, "verbose mode")
+
+	if err = fsLogPurgeCommand.Parse(args); err != nil {
+		return err
+	}
+
+	modificationTimeAgo := time.Now().Add(-time.Hour * 24 * time.Duration(*daysAgo)).Unix()
+	err = filer_pb.ReadDirAllEntries(commandEnv, filer.SystemLogDir, "", func(entry *filer_pb.Entry, isLast bool) error {
+		if entry.Attributes.Mtime > modificationTimeAgo {
+			return nil
+		}
+		if errDel := filer_pb.Remove(commandEnv, filer.SystemLogDir, entry.Name, true, true, true, false, nil); errDel != nil {
+			return errDel
+		}
+		if *verbose {
+			fmt.Fprintf(writer, "delete %s\n", entry.Name)
+		}
+		return nil
+	})
+	return err
+}
diff --git a/weed/shell/shell_liner.go b/weed/shell/shell_liner.go
index 28672c17c..20add302a 100644
--- a/weed/shell/shell_liner.go
+++ b/weed/shell/shell_liner.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"github.com/seaweedfs/seaweedfs/weed/cluster"
 	"github.com/seaweedfs/seaweedfs/weed/pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
 	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
 	"github.com/seaweedfs/seaweedfs/weed/util"
 	"github.com/seaweedfs/seaweedfs/weed/util/grace"
@@ -74,24 +73,6 @@ func RunShell(options ShellOptions) {
 		fmt.Println()
 	}
 
-	if commandEnv.option.FilerAddress != "" {
-		commandEnv.WithFilerClient(false, func(filerClient filer_pb.SeaweedFilerClient) error {
-			resp, err := filerClient.GetFilerConfiguration(context.Background(), &filer_pb.GetFilerConfigurationRequest{})
-			if err != nil {
-				return err
-			}
-			if resp.ClusterId != "" {
-				fmt.Printf(`
----
-Free Monitoring Data URL:
-https://cloud.seaweedfs.com/ui/%s
----
-`, resp.ClusterId)
-			}
-			return nil
-		})
-	}
-
 	for {
 		cmd, err := line.Prompt("> ")
 		if err != nil {