SCFF-34 logging modifications

Author: nmillalaf

eventRouting/eventrouting.go

@@ -10,7 +10,6 @@ import (
 	"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/caching"
 	"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/eventQueue"
 	fevents "bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/events"
-	"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/logging"
 	"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/sumoCFFirehose"
 	"github.com/Sirupsen/logrus"
 	"github.com/cloudfoundry/sonde-go/events"
@@ -77,10 +76,8 @@ func (e *EventRouting) RouteEvent(msg *events.Envelope) {
 			e.selectedEventsCount["ignored_app_message"]++
 		} else {
 			//Push the event to the queue
-			logging.Info.Println("pushing event to queue")
 			e.queue.Push(event)
 			e.selectedEventsCount[eventType.String()]++
-
 		}
 		e.mutex.Unlock()
 	}

firehoseclient/firehoseclient.go

@@ -2,10 +2,10 @@ package firehoseclient
 
 import (
 	"crypto/tls"
-	"fmt"
 	"time"
 
 	"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/eventRouting"
+	"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/logging"
 	"github.com/cloudfoundry-community/go-cfclient"
 	"github.com/cloudfoundry/noaa/consumer"
 	"github.com/cloudfoundry/sonde-go/events"
@@ -43,11 +43,10 @@ func NewFirehoseNozzle(cfClient *cfclient.Client, eventRouting *eventRouting.Eve
 }
 
 func (f *FirehoseNozzle) Start() error {
-	fmt.Printf("Started the Nozzle... \n")
+	logging.Info.Printf("Started the Nozzle... \n")
 	f.consumeFirehose()
-	fmt.Printf("consume the firehose... \n")
+	logging.Info.Printf("consume the firehose... \n")
 	err := f.routeEvent()
-	fmt.Printf("route event... \n")
 	return err
 }
 

main.go

@@ -47,6 +47,12 @@ func main() {
 
 	runtime.GOMAXPROCS(1)
 
+	logging.Info.Println("Configurations set:")
+	logging.Info.Println("Api Endpoint: " + apiEndpoint)
+	logging.Info.Println("Sumo Endpoint: " + *sumoEndpoint)
+	logging.Info.Println("User: " + user)
+	logging.Info.Printf("Events Batch Size: [%d]\n", eventsBatchSize)
+
 	logging.Info.Println("Starting firehose-to-sumo " + version)
 
 	c := cfclient.Config{
@@ -69,12 +75,12 @@ func main() {
 		cachingClient = caching.NewCachingEmpty()
 	}
 
-	//Creating queue
+	logging.Info.Println("Creating queue")
 	queue := eventQueue.NewQueue(make([]*events.Event, 100))
 	loggingClientSumo := sumoCFFirehose.NewSumoLogicAppender(*sumoEndpoint, 1000, &queue, *eventsBatchSize)
 	go loggingClientSumo.Start() //multi
 
-	//Creating Events
+	logging.Info.Println("Creating Events")
 	events := eventRouting.NewEventRouting(cachingClient, *loggingClientSumo, &queue)
 	err := events.SetupEventRouting(*wantedEvents)
 	if err != nil {

sumoCFFirehose/sumoLogicAppender.go

@@ -41,11 +41,11 @@ func (s *SumoLogicAppender) Start() {
 			s.AppendLogs()
 		}
 		if s.logEventsInCurrentBuffer >= s.eventsBatchSize { //if buffer is full, send logs to sumo
-			logging.Info.Println("Buffer full")
+			logging.Trace.Println("Batch Size complete")
 			s.SendToSumo(s.logStringToSend)
 
 		} else if time.Since(timer).Seconds() >= 10 { // else if timer is up, send existing logs to sumo
-			logging.Info.Println("timer finished")
+			logging.Trace.Println("Sending current batch of logs after timer exceeded limit")
 			s.SendToSumo(s.logStringToSend)
 			timer = time.Now() //reset timer
 		}
@@ -75,7 +75,7 @@ func (s *SumoLogicAppender) AppendLogs() {
 }
 
 func (s *SumoLogicAppender) SendToSumo(log *bytes.Buffer) {
-	logging.Info.Println("Sending logs to Sumologic...")
+	logging.Trace.Println("Sending logs to Sumologic...")
 	request, err := http.NewRequest("POST", s.url, log)
 	if err != nil {
 		logging.Error.Printf("http.NewRequest() error: %v\n", err)
@@ -89,7 +89,7 @@ func (s *SumoLogicAppender) SendToSumo(log *bytes.Buffer) {
 		logging.Error.Printf("http.Do() error: %v\n", err)
 		return
 	} else {
-		logging.Info.Println("Do(Request) successful")
+		logging.Trace.Println("Do(Request) successful")
 	}
 	s.logEventsInCurrentBuffer = 0                // reset counter
 	s.logStringToSend = bytes.NewBufferString("") //reset String