From ce8ec8a151167f523458c96738981849c3dd855b Mon Sep 17 00:00:00 2001 From: "Jonathan Leibiusky @xetorthio" Date: Thu, 10 Aug 2017 17:04:40 -0300 Subject: [PATCH] EventType is now based on string --- event/event.go | 40 +++++++--------------------- scheduler/task/check_ports.go | 2 +- scheduler/task/check_swarm_ports.go | 2 +- scheduler/task/check_swarm_status.go | 2 +- scheduler/task/collect_stats.go | 2 +- 5 files changed, 14 insertions(+), 34 deletions(-) diff --git a/event/event.go b/event/event.go index c956767..225fe43 100644 --- a/event/event.go +++ b/event/event.go @@ -1,40 +1,20 @@ package event -var events []string - -type EventType int +type EventType string func (e EventType) String() string { - return events[int(e)] -} - -func ciota(s string) EventType { - events = append(events, s) - return EventType(len(events) - 1) -} - -func FindEventType(name string) (EventType, bool) { - for i, event := range events { - if event == name { - return EventType(i), true - } - } - return EventType(-1), false -} - -func NewEventType(name string) EventType { - return ciota(name) + return string(e) } var ( - INSTANCE_VIEWPORT_RESIZE = ciota("instance viewport resize") - INSTANCE_DELETE = ciota("instance delete") - INSTANCE_NEW = ciota("instance new") - INSTANCE_STATS = ciota("instance stats") - SESSION_NEW = ciota("session new") - SESSION_END = ciota("session end") - SESSION_READY = ciota("session ready") - SESSION_BUILDER_OUT = ciota("session builder out") + INSTANCE_VIEWPORT_RESIZE = EventType("instance viewport resize") + INSTANCE_DELETE = EventType("instance delete") + INSTANCE_NEW = EventType("instance new") + INSTANCE_STATS = EventType("instance stats") + SESSION_NEW = EventType("session new") + SESSION_END = EventType("session end") + SESSION_READY = EventType("session ready") + SESSION_BUILDER_OUT = EventType("session builder out") ) type Handler func(sessionId string, args ...interface{}) diff --git a/scheduler/task/check_ports.go b/scheduler/task/check_ports.go index 29b66cd..77da28a 100644 --- a/scheduler/task/check_ports.go +++ b/scheduler/task/check_ports.go @@ -22,7 +22,7 @@ type checkPorts struct { var CheckPortsEvent event.EventType func init() { - CheckPortsEvent = event.NewEventType("instance docker ports") + CheckPortsEvent = event.EventType("instance docker ports") } func (t *checkPorts) Name() string { diff --git a/scheduler/task/check_swarm_ports.go b/scheduler/task/check_swarm_ports.go index 3357148..531fee0 100644 --- a/scheduler/task/check_swarm_ports.go +++ b/scheduler/task/check_swarm_ports.go @@ -24,7 +24,7 @@ type checkSwarmPorts struct { var CheckSwarmPortsEvent event.EventType func init() { - CheckSwarmPortsEvent = event.NewEventType("instance docker swarm ports") + CheckSwarmPortsEvent = event.EventType("instance docker swarm ports") } func (t *checkSwarmPorts) Name() string { diff --git a/scheduler/task/check_swarm_status.go b/scheduler/task/check_swarm_status.go index 8e02402..d8b2098 100644 --- a/scheduler/task/check_swarm_status.go +++ b/scheduler/task/check_swarm_status.go @@ -24,7 +24,7 @@ type checkSwarmStatus struct { var CheckSwarmStatusEvent event.EventType func init() { - CheckSwarmStatusEvent = event.NewEventType("instance docker swarm status") + CheckSwarmStatusEvent = event.EventType("instance docker swarm status") } func (t *checkSwarmStatus) Name() string { diff --git a/scheduler/task/collect_stats.go b/scheduler/task/collect_stats.go index 30392e4..a9c6fb8 100644 --- a/scheduler/task/collect_stats.go +++ b/scheduler/task/collect_stats.go @@ -27,7 +27,7 @@ type collectStats struct { var CollectStatsEvent event.EventType func init() { - CollectStatsEvent = event.NewEventType("instance stats") + CollectStatsEvent = event.EventType("instance stats") } func (t *collectStats) Name() string {