EventType is now based on string

naiiytom · Aug 10, 2017 · ce8ec8a · ce8ec8a
1 parent 79181b2
commit ce8ec8a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 {