summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-03-14 10:22:36 -0700
committer=Corey Hulen <corey@hulen.com>2016-03-14 10:22:36 -0700
commit397ebec88c2db3569efd77238bf877e976492d34 (patch)
tree926fcda714c3ce277d07cb1278019a71f4e6d6ee
parent013f27ff1a5b502560864ebba43bd2ba6c8020ab (diff)
downloadchat-397ebec88c2db3569efd77238bf877e976492d34.tar.gz
chat-397ebec88c2db3569efd77238bf877e976492d34.tar.bz2
chat-397ebec88c2db3569efd77238bf877e976492d34.zip
PLT-2115 adding compliance
-rw-r--r--einterfaces/compliance.go5
-rw-r--r--i18n/en.json17
-rw-r--r--store/sql_post_store.go2
3 files changed, 14 insertions, 10 deletions
diff --git a/einterfaces/compliance.go b/einterfaces/compliance.go
index 522a949db..cd43152da 100644
--- a/einterfaces/compliance.go
+++ b/einterfaces/compliance.go
@@ -3,10 +3,13 @@
package einterfaces
-import ()
+import (
+ "github.com/mattermost/platform/model"
+)
type ComplianceInterface interface {
StartComplianceDailyJob()
+ RunComplianceJob(jobName string, dir string, filename string, startTime int64, endTime int64) *model.AppError
}
var theComplianceInterface ComplianceInterface
diff --git a/i18n/en.json b/i18n/en.json
index 6eebb02c4..57d5179b6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1776,21 +1776,22 @@
"translation": "Failed to read security bulletin details"
},
{
- "id": "mattermost.compliance_init.info",
- "translation": "Compliance running for the first time initializing to yesterday"
+ "id": "ent.compliance.run_started.info",
+ "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
},
{
- "id": "mattermost.compliance_run.info",
- "translation": "Compliance export started for {{.Time}}"
+ "id": "ent.compliance.run_failed.error",
+ "translation": "Compliance export failed for job '{{.JobName}}' at '{{.FilePath}}'"
},
{
- "id": "mattermost.compliance_run_fail.error",
- "translation": "Compliance export failed for {{.Time}} with err='{{.Error}}'"
+ "id": "ent.compliance.run_limit.warning",
+ "translation": "Compliance export warning for job '{{.JobName}}' too many rows returned truncating to 30,000 at '{{.FilePath}}'"
},
{
- "id": "mattermost.compliance_run_finish.info",
- "translation": "Compliance export finished writing {{.Count}} items to {{.Filename}}"
+ "id": "ent.compliance.run_finished.info",
+ "translation": "Compliance export finished for job '{{.JobName}}' exported {{.Count}} records to '{{.FilePath}}'"
},
+
{
"id": "mattermost.security_checks.debug",
"translation": "Checking for security update from Mattermost"
diff --git a/store/sql_post_store.go b/store/sql_post_store.go
index aa296c0f6..198347ff2 100644
--- a/store/sql_post_store.go
+++ b/store/sql_post_store.go
@@ -1019,7 +1019,7 @@ func (s SqlPostStore) ComplianceExport(startTime int64, endTime int64) StoreChan
AND Posts.CreateAt > :StartTime
AND Posts.CreateAt <= :EndTime
ORDER BY Posts.CreateAt
- LIMIT 50000`
+ LIMIT 30000`
var cposts []*model.CompliancePost