Skip to content

Commit

Permalink
test for @Cee:
Browse files Browse the repository at this point in the history
  • Loading branch information
@aybabtme
aybabtme authored and Antoine Grondin committed Sep 15, 2022
1 parent c66f0c3 commit ac3ea5d
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.12
- name: Set up Go 1.19
uses: actions/setup-go@v1
with:
go-version: 1.12
go-version: 1.19
id: go

- name: Check out code into the Go module directory
Expand Down
3 changes: 3 additions & 0 deletions e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ func TestHarness(t *testing.T) {
}
}
mismatches := len(ranges.ranges)
if mismatches == 0 {
return
}
t.Errorf("total of %d ranges mismatch", mismatches)
if len(ranges.ranges) > 10 {
mismatches = 10
Expand Down
2 changes: 0 additions & 2 deletions json_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,6 @@ func (h *JSONHandler) Prettify(skipUnchanged bool) []byte {
msgColor = h.Opts.palette.MsgDarkBgColor
msgAbsentColor = h.Opts.palette.MsgAbsentDarkBgColor
}
msgColor = color.New(color.FgHiWhite)
msgAbsentColor = color.New(color.FgHiWhite)

var msg string
if h.Message == "" {
Expand Down
8 changes: 4 additions & 4 deletions scripts/README.tmpl.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ Read logs from `stdin` and prints them back to `stdout`, but prettier.

# Using it

[Grab a release](https://github.com/aybabtme/humanlog/releases) or :
[Grab a release](https://github.com/humanlogio/humanlog/releases) or :

## With Go installed
```bash
$ go get -u github.com/aybabtme/humanlog/...
$ go get -u github.com/humanlogio/humanlog/...
```

## On linux

```bash
wget -qO- https://github.com/aybabtme/humanlog/releases/download/{{.version}}/humanlog_{{.version}}_linux_amd64.tar.gz | tar xvz
wget -qO- https://github.com/humanlogio/humanlog/releases/download/{{.version}}/humanlog_{{.version}}_linux_amd64.tar.gz | tar xvz
```

## On OS X
Expand All @@ -33,7 +33,7 @@ entries are encountered by `humanlog`. Unrecognized lines are left unchanged.
$ humanlog < /var/log/logfile.log
```

![2__fish___users_antoine_gocode_src_github_com_aybabtme_humanlog__fish_](https://cloud.githubusercontent.com/assets/1189716/4328545/f2330bb4-3f86-11e4-8242-4f49f6ae9efc.png)
![2__fish___users_antoine_gocode_src_github_com_humanlogio_humanlog__fish_](https://cloud.githubusercontent.com/assets/1189716/4328545/f2330bb4-3f86-11e4-8242-4f49f6ae9efc.png)

# Contributing

Expand Down
30 changes: 29 additions & 1 deletion test/cases/0001/opts.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1,29 @@
{}
{
"skip": null,
"keep": null,
"time_fields": [
"time",
"ts",
"@timestamp",
"timestamp"
],
"message_fields": [
"message",
"msg"
],
"level_fields": [
"level",
"lvl",
"loglevel",
"severity"
],
"sort_longest": true,
"skip_unchanged": true,
"truncates": false,
"light_bg": false,
"color_mode": 2,
"truncate_length": 15,
"time_format": "Jan _2 15:04:05",
"palette": null
}

16 changes: 8 additions & 8 deletions test/cases/0001/want
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{"data":{"short":"service-startup","message":"The login-api service is running on port 8085."},"datacontenttype":"application/json","id":"01FCV6S4M6S8H3VKAQD9SWFWFP","invloglevel":"Info","source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:14:50.246861-05:00","type":"simple-log"}
{"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6S9YK70GJ5Q6YT0PYKQDA","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6S9YJXD2SYG3HTGWXHX0G","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:14:55.699075-05:00","type":"incoming_http_request"}
{"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SDKRW3XZDA1FAGZ3QVSH","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SDKRHB1RR1Q87Q1SKT5P","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:14:59.448566-05:00","type":"incoming_http_request"}
{"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SE597EY6RJ762V59PZQA","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SE596ZMASA1D79M16KVV","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:00.009615-05:00","type":"incoming_http_request"}
{"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SEKCC9RG364AJ60J75KW","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SEKCNSQJJ2NDEPQ2TGMP","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:00.46025-05:00","type":"incoming_http_request"}
{"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SF3DXGB8G1DVX19KQZYT","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SF3DJZSXTT1RNR6F1QAV","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:00.973455-05:00","type":"incoming_http_request"}
{"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SKY9MM7D795258XPQGC9","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SKY9M1D725HTV0ZXKF1V","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:05.929423-05:00","type":"incoming_http_request"}
{"data":{"event":"Shutdown"},"datacontenttype":"application/json","id":"01FCV6SR6JZH7JZ6RFDFN9Q99Y","invloglevel":"Info","source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:10.290034-05:00","type":"service-shutdown"}
Aug 11 13:14:50 || <no msg> specversion="1.0" type="simple-log" invloglevel="Info" id="01FCV6S4M6S8H3VKAQD9SWFWFP" datacontenttype="application/json" source="irn:libraries:github.com/InVisionApp/invlogger" data=map[message:The login-api service is running on port 8085. short:service-startup]
Aug 11 13:14:55 || <no msg> invweburl="" invwebbytes=0 invwebstatus=0 invwebbytesin=0 invwebbytesout=0 invwebduration=0 invweburipath="" invwebdesthost="" invweburiquery="" invweburllength=0 invwebcached=false invwebhttpmethod="" invwebhttpuseragent="" invwebhttpcontenttype="" invwebhttpuseragentlength=0 invwebsrcip="::ffff:0.0.0.0" type="incoming_http_request" invwebdestip="::ffff:0.0.0.0" id="01FCV6S9YK70GJ5Q6YT0PYKQDA" invapptracingtequestsource="unset" invapptracingcallingservice="unset" invapptracingrequestid="01FCV6S9YJXD2SYG3HTGWXHX0G" data=map[message:incoming HTTP request was served short:http access]
Aug 11 13:14:59 || <no msg> id="01FCV6SDKRW3XZDA1FAGZ3QVSH" invapptracingrequestid="01FCV6SDKRHB1RR1Q87Q1SKT5P"
Aug 11 13:15:00 || <no msg> id="01FCV6SE597EY6RJ762V59PZQA" invapptracingrequestid="01FCV6SE596ZMASA1D79M16KVV"
Aug 11 13:15:00 || <no msg> id="01FCV6SEKCC9RG364AJ60J75KW" invapptracingrequestid="01FCV6SEKCNSQJJ2NDEPQ2TGMP"
Aug 11 13:15:00 || <no msg> id="01FCV6SF3DXGB8G1DVX19KQZYT" invapptracingrequestid="01FCV6SF3DJZSXTT1RNR6F1QAV"
Aug 11 13:15:05 || <no msg> id="01FCV6SKY9MM7D795258XPQGC9" invapptracingrequestid="01FCV6SKY9M1D725HTV0ZXKF1V"
Aug 11 13:15:10 || <no msg> type="service-shutdown" data=map[event:Shutdown] id="01FCV6SR6JZH7JZ6RFDFN9Q99Y"
8 changes: 8 additions & 0 deletions test/cases/0002/input
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@cee: {"data":{"short":"service-startup","message":"The login-api service is running on port 8085."},"datacontenttype":"application/json","id":"01FCV6S4M6S8H3VKAQD9SWFWFP","invloglevel":"Info","source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:14:50.246861-05:00","type":"simple-log"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6S9YK70GJ5Q6YT0PYKQDA","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6S9YJXD2SYG3HTGWXHX0G","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:14:55.699075-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SDKRW3XZDA1FAGZ3QVSH","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SDKRHB1RR1Q87Q1SKT5P","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:14:59.448566-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SE597EY6RJ762V59PZQA","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SE596ZMASA1D79M16KVV","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:00.009615-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SEKCC9RG364AJ60J75KW","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SEKCNSQJJ2NDEPQ2TGMP","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:00.46025-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SF3DXGB8G1DVX19KQZYT","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SF3DJZSXTT1RNR6F1QAV","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:00.973455-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SKY9MM7D795258XPQGC9","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SKY9M1D725HTV0ZXKF1V","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:05.929423-05:00","type":"incoming_http_request"}
@cee: {"data":{"event":"Shutdown"},"datacontenttype":"application/json","id":"01FCV6SR6JZH7JZ6RFDFN9Q99Y","invloglevel":"Info","source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:10.290034-05:00","type":"service-shutdown"}
29 changes: 29 additions & 0 deletions test/cases/0002/opts.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"skip": null,
"keep": null,
"time_fields": [
"time",
"ts",
"@timestamp",
"timestamp"
],
"message_fields": [
"message",
"msg"
],
"level_fields": [
"level",
"lvl",
"loglevel",
"severity"
],
"sort_longest": true,
"skip_unchanged": true,
"truncates": false,
"light_bg": false,
"color_mode": 2,
"truncate_length": 15,
"time_format": "Jan _2 15:04:05",
"palette": null
}

8 changes: 8 additions & 0 deletions test/cases/0002/want
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Aug 11 13:14:50 || <no msg> specversion="1.0" type="simple-log" invloglevel="Info" id="01FCV6S4M6S8H3VKAQD9SWFWFP" datacontenttype="application/json" source="irn:libraries:github.com/InVisionApp/invlogger" data=map[message:The login-api service is running on port 8085. short:service-startup]
Aug 11 13:14:55 || <no msg> invweburl="" invwebbytes=0 invwebstatus=0 invwebbytesin=0 invwebbytesout=0 invwebduration=0 invweburipath="" invwebdesthost="" invweburiquery="" invweburllength=0 invwebcached=false invwebhttpmethod="" invwebhttpuseragent="" invwebhttpcontenttype="" invwebhttpuseragentlength=0 invwebsrcip="::ffff:0.0.0.0" type="incoming_http_request" invwebdestip="::ffff:0.0.0.0" id="01FCV6S9YK70GJ5Q6YT0PYKQDA" invapptracingtequestsource="unset" invapptracingcallingservice="unset" invapptracingrequestid="01FCV6S9YJXD2SYG3HTGWXHX0G" data=map[message:incoming HTTP request was served short:http access]
Aug 11 13:14:59 || <no msg> id="01FCV6SDKRW3XZDA1FAGZ3QVSH" invapptracingrequestid="01FCV6SDKRHB1RR1Q87Q1SKT5P"
Aug 11 13:15:00 || <no msg> id="01FCV6SE597EY6RJ762V59PZQA" invapptracingrequestid="01FCV6SE596ZMASA1D79M16KVV"
Aug 11 13:15:00 || <no msg> id="01FCV6SEKCC9RG364AJ60J75KW" invapptracingrequestid="01FCV6SEKCNSQJJ2NDEPQ2TGMP"
Aug 11 13:15:00 || <no msg> id="01FCV6SF3DXGB8G1DVX19KQZYT" invapptracingrequestid="01FCV6SF3DJZSXTT1RNR6F1QAV"
Aug 11 13:15:05 || <no msg> id="01FCV6SKY9MM7D795258XPQGC9" invapptracingrequestid="01FCV6SKY9M1D725HTV0ZXKF1V"
Aug 11 13:15:10 || <no msg> type="service-shutdown" data=map[event:Shutdown] id="01FCV6SR6JZH7JZ6RFDFN9Q99Y"

0 comments on commit ac3ea5d

Please sign in to comment.