From 1bf2a2e8d5a552d23e16379e73c2d4aaefc9368f Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 25 Sep 2017 15:02:41 -0400 Subject: PLT-7641: Cleanup the jsonl files from `make test` (#7466) * Disabled automatic log rotation to avoid multiple log file creation, added mattermost.log.jsonl files to gitignore * Added log file delete to make clean --- .gitignore | 2 ++ Makefile | 2 ++ utils/logger/log4go_json_writer.go | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 57747b36d..a7a6032e3 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ _testmain.go # Log files *mattermost.log +*mattermost.log.jsonl *npm-debug.log* .tmp @@ -84,6 +85,7 @@ enterprise cover.out ecover.out +cprofile.out *.test webapp/coverage diff --git a/Makefile b/Makefile index a1fed8078..875318fac 100644 --- a/Makefile +++ b/Makefile @@ -455,8 +455,10 @@ clean: stop-docker rm -rf logs rm -f mattermost.log + rm -f mattermost.log.jsonl rm -f npm-debug.log rm -f api/mattermost.log + rm -f api/mattermost.log.jsonl rm -f .prepare-go rm -f enterprise rm -f cover.out diff --git a/utils/logger/log4go_json_writer.go b/utils/logger/log4go_json_writer.go index 312923ba7..cc054dc6c 100644 --- a/utils/logger/log4go_json_writer.go +++ b/utils/logger/log4go_json_writer.go @@ -22,6 +22,6 @@ func newJSONLogWriter(fname string, rotate bool) *l4g.FileLogWriter { // or above lvl to a file with the specified filename. func NewJSONFileLogger(lvl l4g.Level, filename string) l4g.Logger { return l4g.Logger{ - "file": &l4g.Filter{Level: lvl, LogWriter: newJSONLogWriter(filename, true)}, + "file": &l4g.Filter{Level: lvl, LogWriter: newJSONLogWriter(filename, false)}, } } -- cgit v1.2.3-1-g7c22