Merged in feature/SCFF-24 (pull request #4)

feature/SCFF-24 removed files related to syslog

Author: sklava

caching/caching_boltdb.go

@@ -2,13 +2,14 @@ package caching
 
 import (
 	"fmt"
-	"github.com/boltdb/bolt"
-	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
-	cfClient "github.com/cloudfoundry-community/go-cfclient"
-	json "github.com/mailru/easyjson"
+
 	"log"
 	"os"
 	"time"
+
+	"github.com/boltdb/bolt"
+	cfClient "github.com/cloudfoundry-community/go-cfclient"
+	json "github.com/mailru/easyjson"
 )
 
 type CachingBolt struct {
@@ -104,12 +105,11 @@ func (c *CachingBolt) GetAppByGuid(appGuid string) []App {
 
 func (c *CachingBolt) GetAllApp() []App {
 
-	logging.LogStd("Retrieving Apps for Cache...", false)
 	var apps []App
 
 	defer func() {
 		if r := recover(); r != nil {
-			logging.LogError("Recovered in caching.GetAllApp()", r)
+			//logging.LogError("Recovered in caching.GetAllApp()", r)
 		}
 	}()
 
@@ -119,7 +119,7 @@ func (c *CachingBolt) GetAllApp() []App {
 	}
 
 	for _, app := range cfApps {
-		logging.LogStd(fmt.Sprintf("App [%s] Found...", app.Name), false)
+		fmt.Printf("App [%s] Found... \n", app.Name)
 		apps = append(apps, App{
 			app.Name,
 			app.Guid,
@@ -132,7 +132,7 @@ func (c *CachingBolt) GetAllApp() []App {
 	}
 
 	c.fillDatabase(apps)
-	logging.LogStd(fmt.Sprintf("Found [%d] Apps!", len(apps)), false)
+	fmt.Printf("Found [%d] Apps!", len(apps))
 
 	return apps
 }
@@ -142,7 +142,6 @@ func (c *CachingBolt) GetAppInfo(appGuid string) App {
 	var d []byte
 	var app App
 	c.Appdb.View(func(tx *bolt.Tx) error {
-		logging.LogStd(fmt.Sprintf("Looking for App %s in Cache!\n", appGuid), false)
 		b := tx.Bucket([]byte("AppBucket"))
 		d = b.Get([]byte(appGuid))
 		return nil

eventRouting/eventRouting_test.go

@@ -3,7 +3,6 @@ package eventRouting_test
 import (
 	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching/cachingfakes"
 	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
-	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging/loggingfakes"
 	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose/sumoLog4gofakes" //**
 	. "github.com/cloudfoundry/sonde-go/events"
 	. "github.com/onsi/ginkgo"
@@ -15,10 +14,10 @@ var _ = Describe("Events", func() {
 	var eventRouting *EventRouting
 
 	BeforeEach(func() {
-		logging := new(FakeLogging)
+		//*logging := new(FakeLogging)
 		caching := new(FakeCaching)
 		sLAppender := new(FakeSumoLog4go)
-		eventRouting = NewEventRouting(caching, logging, sLAppender)
+		eventRouting = NewEventRouting(caching, sLAppender)
 		eventRouting.SetupEventRouting("")
 
 	})
@@ -61,13 +60,6 @@ var _ = Describe("Events", func() {
 		})
 	})
 
-	Context("called with extrafield", func() {
-		It("Shoud return correct extrafields", func() {
-			eventRouting.SetExtraFields("dev:env")
-			Expect(eventRouting.ExtraFields).To(Equal(map[string]string{"dev": "env"}))
-		})
-	})
-
 	Context("GetListAuthorizedEventEvents", func() {
 		It("should return right list of authorized events", func() {
 			Expect(GetListAuthorizedEventEvents()).To(Equal("ContainerMetric, CounterEvent, Error, HttpStart, HttpStartStop, HttpStop, LogMessage, ValueMetric"))

eventRouting/eventrouting.go

@@ -2,17 +2,14 @@ package eventRouting
 
 import (
 	"fmt"
-	"os"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
 	fevents "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/events"
-	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/extrafields"
-	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
-	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose" //**
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose"
 	"github.com/Sirupsen/logrus"
 	"github.com/cloudfoundry/sonde-go/events"
 )
@@ -23,19 +20,17 @@ type EventRouting struct {
 	selectedEventsCount map[string]uint64
 	mutex               *sync.Mutex
 	sLAppender          sumoCFFirehose.SumoCFFirehose //**
-	log                 logging.Logging
-	ExtraFields         map[string]string
+	//*log                 logging.Logging
 }
 
-func NewEventRouting(caching caching.Caching, logging logging.Logging, sLAppender sumoCFFirehose.SumoCFFirehose) *EventRouting {
+func NewEventRouting(caching caching.Caching, sLAppender sumoCFFirehose.SumoCFFirehose) *EventRouting {
 	return &EventRouting{
 		CachingClient:       caching,
 		selectedEvents:      make(map[string]bool),
 		selectedEventsCount: make(map[string]uint64),
 		sLAppender:          sLAppender, //**
-		log:                 logging,
-		mutex:               &sync.Mutex{},
-		ExtraFields:         make(map[string]string),
+		//*		log:                 logging,
+		mutex: &sync.Mutex{},
 	}
 }
 
@@ -70,7 +65,6 @@ func (e *EventRouting) RouteEvent(msg *events.Envelope) {
 
 		event.AnnotateWithEnveloppeData(msg)
 
-		event.AnnotateWithMetaData(e.ExtraFields)
 		if _, hasAppId := event.Fields["cf_app_id"]; hasAppId {
 			event.AnnotateWithAppData(e.CachingClient)
 		}
@@ -80,8 +74,10 @@ func (e *EventRouting) RouteEvent(msg *events.Envelope) {
 		if ignored, hasIgnoredField := event.Fields["cf_ignored_app"]; ignored == true && hasIgnoredField {
 			e.selectedEventsCount["ignored_app_message"]++
 		} else {
-			e.sLAppender.AppendLogs(event.Fields)     //**
-			e.log.ShipEvents(event.Fields, event.Msg) // here we have to change the method for the one on sumoLogicAppender
+			/*fmt.Printf("I'm in eventRpouting method .. -------")
+			fmt.Println(event.Fields)
+			fmt.Println(event.Msg)*/
+			e.sLAppender.AppendLogs(event.Fields) //**/here we have to change the method for the one on sumoLogicAppender
 			e.selectedEventsCount[eventType.String()]++
 
 		}
@@ -97,7 +93,7 @@ func (e *EventRouting) SetupEventRouting(wantedEvents string) error {
 		for _, event := range strings.Split(wantedEvents, ",") {
 			if e.isAuthorizedEvent(strings.TrimSpace(event)) {
 				e.selectedEvents[strings.TrimSpace(event)] = true
-				logging.LogStd(fmt.Sprintf("Event Type [%s] is included in the fireshose!", event), false)
+				//logging.LogStd(fmt.Sprintf("Event Type [%s] is included in the fireshose!", event), false)
 			} else {
 				return fmt.Errorf("Rejected Event Name [%s] - Valid events: %s", event, GetListAuthorizedEventEvents())
 			}
@@ -106,16 +102,6 @@ func (e *EventRouting) SetupEventRouting(wantedEvents string) error {
 	return nil
 }
 
-func (e *EventRouting) SetExtraFields(extraEventsString string) {
-	// Parse extra fields from cmd call
-	extraFields, err := extrafields.ParseExtraFields(extraEventsString)
-	if err != nil {
-		logging.LogError("Error parsing extra fields: ", err)
-		os.Exit(1)
-	}
-	e.ExtraFields = extraFields
-}
-
 func (e *EventRouting) isAuthorizedEvent(wantedEvent string) bool {
 	for _, authorizeEvent := range events.Envelope_EventType_name {
 		if wantedEvent == authorizeEvent {
@@ -159,7 +145,8 @@ func (e *EventRouting) LogEventTotals(logTotalsTime time.Duration) {
 			startTime = time.Now()
 			event, lastCount := e.getEventTotals(totalElapsedTime, elapsedTime, count)
 			count = lastCount
-			e.log.ShipEvents(event.Fields, event.Msg)
+			//*e.log.ShipEvents(event.Fields, event.Msg)
+			e.sLAppender.AppendLogs(event.Fields)
 		}
 	}()
 }

extrafields/extrafields.go

@@ -5,7 +5,8 @@ import (
 	"time"
 
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
-	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
+	//*"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
+
 	"github.com/cloudfoundry-community/go-cfclient"
 	"github.com/cloudfoundry/noaa/consumer"
 	"github.com/cloudfoundry/sonde-go/events"
@@ -75,22 +76,22 @@ func (f *FirehoseNozzle) handleError(err error) {
 
 	switch {
 	case websocket.IsCloseError(err, websocket.CloseNormalClosure):
-		logging.LogError("Normal Websocket Closure", err)
+		//logging.LogError("Normal Websocket Closure", err)
 	case websocket.IsCloseError(err, websocket.ClosePolicyViolation):
-		logging.LogError("Error while reading from the firehose", err)
-		logging.LogError("Disconnected because nozzle couldn't keep up. Please try scaling up the nozzle.", nil)
+		//logging.LogError("Error while reading from the firehose", err)
+		//logging.LogError("Disconnected because nozzle couldn't keep up. Please try scaling up the nozzle.", nil)
 
 	default:
-		logging.LogError("Error while reading from the firehose", err)
+		//logging.LogError("Error while reading from the firehose", err)
 	}
 
-	logging.LogError("Closing connection with traffic controller due to error", err)
+	//logging.LogError("Closing connection with traffic controller due to error", err)
 	f.consumer.Close()
 }
 
 func (f *FirehoseNozzle) handleMessage(envelope *events.Envelope) {
 	if envelope.GetEventType() == events.Envelope_CounterEvent && envelope.CounterEvent.GetName() == "TruncatingBuffer.DroppedMessages" && envelope.GetOrigin() == "doppler" {
-		logging.LogStd("We've intercepted an upstream message which indicates that the nozzle or the TrafficController is not keeping up. Please try scaling up the nozzle.", true)
+		//logging.LogStd("We've intercepted an upstream message which indicates that the nozzle or the TrafficController is not keeping up. Please try scaling up the nozzle.", true)
 	}
 }