Merge pull request #2344 from ipfs/feat/reqlog-time

add command to change keep time for reqlog objects

commands/reqlog.go

@@ -44,6 +44,7 @@ type ReqLog struct {
 	Requests []*ReqLogEntry
 	nextID   int
 	lock     sync.Mutex
+	keep     time.Duration
 }
 
 func (rl *ReqLog) Add(req Request) *ReqLogEntry {
@@ -69,43 +70,37 @@ func (rl *ReqLog) Add(req Request) *ReqLogEntry {
 func (rl *ReqLog) ClearInactive() {
 	rl.lock.Lock()
 	defer rl.lock.Unlock()
-	i := 0
-	for j := 0; j < len(rl.Requests); j++ {
-		if rl.Requests[j].Active {
-			rl.Requests[i] = rl.Requests[j]
-			i++
-		}
-	}
-	rl.Requests = rl.Requests[:i]
+	k := rl.keep
+	rl.keep = 0
+	rl.cleanup()
+	rl.keep = k
 }
 
 func (rl *ReqLog) maybeCleanup() {
 	// only do it every so often or it might
 	// become a perf issue
-	if len(rl.Requests) == 0 {
+	if len(rl.Requests)%10 == 0 {
 		rl.cleanup()
 	}
 }
 
 func (rl *ReqLog) cleanup() {
-	var i int
-	// drop all logs at are inactive and more than an hour old
-	for ; i < len(rl.Requests); i++ {
-		req := rl.Requests[i]
-		if req.Active || req.EndTime.Add(time.Hour/2).After(time.Now()) {
-			break
-		}
-	}
-
-	if i > 0 {
-		var j int
-		for i < len(rl.Requests) {
-			rl.Requests[j] = rl.Requests[i]
-			j++
+	i := 0
+	now := time.Now()
+	for j := 0; j < len(rl.Requests); j++ {
+		rj := rl.Requests[j]
+		if rj.Active || rl.Requests[j].EndTime.Add(rl.keep).After(now) {
+			rl.Requests[i] = rl.Requests[j]
 			i++
 		}
-		rl.Requests = rl.Requests[:len(rl.Requests)-i]
 	}
+	rl.Requests = rl.Requests[:i]
+}
+
+func (rl *ReqLog) SetKeepTime(t time.Duration) {
+	rl.lock.Lock()
+	defer rl.lock.Unlock()
+	rl.keep = t
 }
 
 // Report generates a copy of all the entries in the requestlog

core/commands/active.go

@@ -25,7 +25,8 @@ Lists running and recently run commands.
 		cmds.BoolOption("v", "verbose", "print more verbose output"),
 	},
 	Subcommands: map[string]*cmds.Command{
-		"clear": clearInactiveCmd,
+		"clear":    clearInactiveCmd,
+		"set-time": setRequestClearCmd,
 	},
 	Marshalers: map[cmds.EncodingType]cmds.Marshaler{
 		cmds.Text: func(res cmds.Response) (io.Reader, error) {
@@ -92,3 +93,21 @@ var clearInactiveCmd = &cmds.Command{
 		req.InvocContext().ReqLog.ClearInactive()
 	},
 }
+
+var setRequestClearCmd = &cmds.Command{
+	Helptext: cmds.HelpText{
+		Tagline: "Set how long to keep inactive requests in the log",
+	},
+	Arguments: []cmds.Argument{
+		cmds.StringArg("time", true, false, "time to keep inactive requests in log"),
+	},
+	Run: func(req cmds.Request, res cmds.Response) {
+		tval, err := time.ParseDuration(req.Arguments()[0])
+		if err != nil {
+			res.SetError(err, cmds.ErrNormal)
+			return
+		}
+
+		req.InvocContext().ReqLog.SetKeepTime(tval)
+	},
+}