event: fix event query should query all types by default (#155)
diff --git a/internal/commands/event/list.go b/internal/commands/event/list.go
index 20efbc3..63ff72b 100644
--- a/internal/commands/event/list.go
+++ b/internal/commands/event/list.go
@@ -34,6 +34,12 @@
)
const DefaultPageSize = 15
+const EventTypeAll event.Type = -1
+
+func init() {
+ event.Type_name[-1] = "All"
+ event.Type_value["All"] = -1
+}
var listCommand = &cli.Command{
Name: "list",
@@ -65,8 +71,8 @@
Usage: "the type of the event",
Value: &model.EventTypeEnumValue{
Enum: []event.Type{event.Type_Normal, event.Type_Error},
- Default: event.Type_Normal,
- Selected: event.Type_Normal,
+ Default: EventTypeAll,
+ Selected: EventTypeAll,
},
},
},
@@ -91,7 +97,7 @@
serviceInstanceName := ctx.String("instance-name")
endpointName := ctx.String("endpoint-name")
name := ctx.String("name")
- eventType := api.EventType(ctx.Generic("type").(*model.EventTypeEnumValue).String())
+ eventType := ctx.Generic("type").(*model.EventTypeEnumValue).Selected
layer := strings.ToUpper(ctx.String("layer"))
pageNum := 1
@@ -106,12 +112,15 @@
Endpoint: &endpointName,
},
Name: &name,
- Type: &eventType,
Time: &duration,
Layer: &layer,
Order: nil,
Paging: &paging,
}
+ if eventType != EventTypeAll {
+ t := api.EventType(eventType.String())
+ condition.Type = &t
+ }
events, err := eventQl.Events(ctx, condition)
