From c55239f3a47c951ca2686fff5c44ab78ee3df7ef Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Thu, 8 Feb 2018 09:49:02 +0100
Subject: [PATCH] fix: better events visualization

---
 modules/events_view.go | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/events_view.go b/modules/events_view.go
index 104caabb..2bcf4822 100644
--- a/modules/events_view.go
+++ b/modules/events_view.go
@@ -13,9 +13,8 @@ import (
 const eventTimeFormat = "2006-01-02 15:04:05"
 
 func (s EventsStream) viewLogEvent(e session.Event) {
-	fmt.Printf("[%s] [%s] (%s) %s\n",
+	fmt.Printf("[%s] [%s] %s\n",
 		e.Time.Format(eventTimeFormat),
-		core.Green(e.Tag),
 		e.Label(),
 		e.Data.(session.LogMessage).Message)
 }
@@ -23,21 +22,20 @@ func (s EventsStream) viewLogEvent(e session.Event) {
 func (s EventsStream) viewEndpointEvent(e session.Event) {
 	t := e.Data.(*net.Endpoint)
 	if e.Tag == "endpoint.new" {
-		fmt.Printf("[%s] [%s] Endpoint %s detected as %s\n",
+		fmt.Printf("[%s] Endpoint %s detected as %s.\n",
 			e.Time.Format(eventTimeFormat),
-			core.Green(e.Tag),
 			core.Bold(t.IpAddress),
-			t.HwAddress)
+			core.Green(t.HwAddress))
 	} else if e.Tag == "endpoint.resolved" {
-		fmt.Printf("[%s] [%s] Endpoint %s resolved as %s\n",
-			e.Time.Format(eventTimeFormat),
-			core.Green(e.Tag),
-			core.Bold(t.IpAddress),
-			core.Yellow(t.Hostname))
+		if *session.I.Options.Debug {
+			fmt.Printf("[%s] Endpoint %s resolved as %s.\n",
+				e.Time.Format(eventTimeFormat),
+				core.Bold(t.IpAddress),
+				core.Yellow(t.Hostname))
+		}
 	} else if e.Tag == "endpoint.lost" {
-		fmt.Printf("[%s] [%s] Endpoint %s lost\n",
+		fmt.Printf("[%s] Endpoint %s lost.\n",
 			e.Time.Format(eventTimeFormat),
-			core.Green(e.Tag),
 			core.Red(t.IpAddress))
 	} else {
 		fmt.Printf("[%s] [%s] %s\n",