From ddd99f747663ff6f2a5446ab7fc92490ea90ddef Mon Sep 17 00:00:00 2001
From: Yusuke Nemoto <kaakaa@users.noreply.github.com>
Date: Thu, 14 Dec 2017 04:04:55 +0900
Subject: PLT-6896 per-paging for logs (#7903)

* PLT-6896 Read logs from last

* Getting rid of file.Stats

* remove deprecated value

* Make non-reassigned value constant
---
 api4/params.go      | 17 ++++++++++++++---
 api4/system.go      |  2 +-
 api4/system_test.go | 16 ++++++++--------
 3 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'api4')

diff --git a/api4/params.go b/api4/params.go
index 1f0fe8e63..64ee43771 100644
--- a/api4/params.go
+++ b/api4/params.go
@@ -11,9 +11,11 @@ import (
 )
 
 const (
-	PAGE_DEFAULT     = 0
-	PER_PAGE_DEFAULT = 60
-	PER_PAGE_MAXIMUM = 200
+	PAGE_DEFAULT          = 0
+	PER_PAGE_DEFAULT      = 60
+	PER_PAGE_MAXIMUM      = 200
+	LOGS_PER_PAGE_DEFAULT = 10000
+	LOGS_PER_PAGE_MAXIMUM = 10000
 )
 
 type ApiParams struct {
@@ -43,6 +45,7 @@ type ApiParams struct {
 	ActionId       string
 	Page           int
 	PerPage        int
+	LogsPerPage    int
 	Permanent      bool
 }
 
@@ -165,5 +168,13 @@ func ApiParamsFromRequest(r *http.Request) *ApiParams {
 		params.PerPage = val
 	}
 
+	if val, err := strconv.Atoi(r.URL.Query().Get("logs_per_page")); err != nil || val < 0 {
+		params.LogsPerPage = LOGS_PER_PAGE_DEFAULT
+	} else if val > LOGS_PER_PAGE_MAXIMUM {
+		params.LogsPerPage = LOGS_PER_PAGE_MAXIMUM
+	} else {
+		params.LogsPerPage = val
+	}
+
 	return params
 }
diff --git a/api4/system.go b/api4/system.go
index 7bc846766..93e9ddcd2 100644
--- a/api4/system.go
+++ b/api4/system.go
@@ -187,7 +187,7 @@ func getLogs(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	lines, err := c.App.GetLogs(c.Params.Page, c.Params.PerPage)
+	lines, err := c.App.GetLogs(c.Params.Page, c.Params.LogsPerPage)
 	if err != nil {
 		c.Err = err
 		return
diff --git a/api4/system_test.go b/api4/system_test.go
index 3afcf633c..1b2bb5d99 100644
--- a/api4/system_test.go
+++ b/api4/system_test.go
@@ -308,18 +308,18 @@ func TestGetLogs(t *testing.T) {
 	logs, resp := th.SystemAdminClient.GetLogs(0, 10)
 	CheckNoError(t, resp)
 
-	// if len(logs) != 10 {
-	// 	t.Log(len(logs))
-	// 	t.Fatal("wrong length")
-	// }
+	if len(logs) != 10 {
+		t.Log(len(logs))
+		t.Fatal("wrong length")
+	}
 
 	logs, resp = th.SystemAdminClient.GetLogs(1, 10)
 	CheckNoError(t, resp)
 
-	// if len(logs) != 10 {
-	// 	t.Log(len(logs))
-	// 	t.Fatal("wrong length")
-	// }
+	if len(logs) != 10 {
+		t.Log(len(logs))
+		t.Fatal("wrong length")
+	}
 
 	logs, resp = th.SystemAdminClient.GetLogs(-1, -1)
 	CheckNoError(t, resp)
-- 
cgit v1.2.3-1-g7c22