feat(admin): basic log filter
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
a193f97d29
commit
a981d98ba5
@ -174,7 +174,10 @@ func (api *API) appGetAdminLogs(c *gin.Context) {
|
|||||||
rAdminLogs.Filter = strings.TrimSpace(rAdminLogs.Filter)
|
rAdminLogs.Filter = strings.TrimSpace(rAdminLogs.Filter)
|
||||||
|
|
||||||
var jqFilter *gojq.Code
|
var jqFilter *gojq.Code
|
||||||
if rAdminLogs.Filter != "" {
|
var basicFilter string
|
||||||
|
if strings.HasPrefix(rAdminLogs.Filter, "\"") && strings.HasSuffix(rAdminLogs.Filter, "\"") {
|
||||||
|
basicFilter = rAdminLogs.Filter[1 : len(rAdminLogs.Filter)-1]
|
||||||
|
} else if rAdminLogs.Filter != "" {
|
||||||
parsed, err := gojq.Parse(rAdminLogs.Filter)
|
parsed, err := gojq.Parse(rAdminLogs.Filter)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Unable to parse JQ filter")
|
log.Error("Unable to parse JQ filter")
|
||||||
@ -220,12 +223,17 @@ func (api *API) appGetAdminLogs(c *gin.Context) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// No Filter
|
// Basic Filter
|
||||||
if jqFilter == nil {
|
if basicFilter != "" && strings.Contains(string(rawData), basicFilter) {
|
||||||
logLines = append(logLines, string(rawData))
|
logLines = append(logLines, string(rawData))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// No JQ Filter
|
||||||
|
if jqFilter == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
// Error or nil
|
// Error or nil
|
||||||
result, _ := jqFilter.Run(jsonMap).Next()
|
result, _ := jqFilter.Run(jsonMap).Next()
|
||||||
if _, ok := result.(error); ok {
|
if _, ok := result.(error); ok {
|
||||||
|
Loading…
Reference in New Issue
Block a user