feature/SCFF-24 deleted code related to firehose-to-syslog imports

Author: nmillalaf

caching/caching_boltdb.go

@@ -3,13 +3,11 @@ package caching
 import (
 	"fmt"
 
-	"github.com/boltdb/bolt"
-	//"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
 	"log"
 	"os"
 	"time"
 
-	"github.com/cloudfoundry-community/firehose-to-syslog1/logging"
+	"github.com/boltdb/bolt"
 	cfClient "github.com/cloudfoundry-community/go-cfclient"
 	json "github.com/mailru/easyjson"
 )
@@ -107,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)
 		}
 	}()
 
@@ -122,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,
@@ -135,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
 }
@@ -145,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

@@ -60,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,7 +2,6 @@ package eventRouting
 
 import (
 	"fmt"
-	"os"
 	"sort"
 	"strings"
 	"sync"
@@ -12,8 +11,6 @@ import (
 	fevents "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/events"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose"
 	"github.com/Sirupsen/logrus"
-	"github.com/cloudfoundry-community/firehose-to-syslog1/extrafields"
-	"github.com/cloudfoundry-community/firehose-to-syslog1/logging"
 	"github.com/cloudfoundry/sonde-go/events"
 )
 
@@ -24,7 +21,6 @@ type EventRouting struct {
 	mutex               *sync.Mutex
 	sLAppender          sumoCFFirehose.SumoCFFirehose //**
 	//*log                 logging.Logging
-	ExtraFields map[string]string
 }
 
 func NewEventRouting(caching caching.Caching, sLAppender sumoCFFirehose.SumoCFFirehose) *EventRouting {
@@ -34,8 +30,7 @@ func NewEventRouting(caching caching.Caching, sLAppender sumoCFFirehose.SumoCFFi
 		selectedEventsCount: make(map[string]uint64),
 		sLAppender:          sLAppender, //**
 		//*		log:                 logging,
-		mutex:       &sync.Mutex{},
-		ExtraFields: make(map[string]string),
+		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)
 		}
@@ -108,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 {