service: add pretty print

audebert · Sep 4, 2014 · 8fd8eaf · 8fd8eaf
1 parent 8ed1e30
commit 8fd8eaf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/cellaserv.go b/cellaserv.go
@@ -237,7 +237,7 @@ func handleSpy(conn net.Conn, req *cellaserv.Request) {
 
 	srvc, ok := services[data.Service][data.Identification]
 	if !ok {
-		log.Warning("[Cellaserv] Could not spy, no such service: %s/%s", data.Service,
+		log.Warning("[Cellaserv] Could not spy, no such service: %s %s", data.Service,
 			data.Identification)
 		sendReplyError(conn, req, cellaserv.Reply_Error_BadArguments)
 		return

diff --git a/main.go b/main.go
@@ -101,7 +101,7 @@ func handle(conn net.Conn) {
 	removeConnFromMap(subscriberMap)
 	removeConnFromMap(subscriberMatchMap)
 
-	// Remove spy info
+	// Remove conn from the services it spied
 	for _, srvc := range connSpies[conn] {
 		for i, connItem := range srvc.Spies {
 			if connItem == conn {

diff --git a/service.go b/service.go
@@ -20,6 +20,13 @@ func newService(conn net.Conn, name string, ident string) *Service {
 	return s
 }
 
+func (s *Service) String() string {
+	if s.Identification != "" {
+		return s.Name + "/" + s.Identification
+	}
+	return s.Name
+}
+
 // JSONStruct creates a struc good for JSON encoding.
 func (s *Service) JSONStruct() *ServiceJSON {
 	return &ServiceJSON{