SCFF-46 commented code lines not being usedin eventRouting and not filling the db

Author: nmillalaf

caching/caching_boltdb.go

@@ -34,6 +34,7 @@ func NewCachingBolt(gcfClientSet *cfClient.Client, boltDatabasePath string) Cach
 }
 
 func (c *CachingBolt) CreateBucket() {
+	//start to write inside the db
 	c.Appdb.Update(func(tx *bolt.Tx) error {
 		_, err := tx.CreateBucketIfNotExists([]byte("AppBucket"))
 		if err != nil {
@@ -65,7 +66,6 @@ func (c *CachingBolt) fillDatabase(listApps []App) {
 			if err != nil {
 				return fmt.Errorf("create bucket: %s", err)
 			}
-
 			serialize, err := json.Marshal(app)
 
 			if err != nil {
@@ -98,7 +98,8 @@ func (c *CachingBolt) GetAppByGuid(appGuid string) []App {
 		app.SpaceData.Entity.OrgData.Entity.Guid,
 		c.isOptOut(app.Environment),
 	})
-	c.fillDatabase(apps)
+	//commented for not filling the db
+	//	c.fillDatabase(apps)
 	return apps
 
 }
@@ -130,8 +131,8 @@ func (c *CachingBolt) GetAllApp() []App {
 			c.isOptOut(app.Environment),
 		})
 	}
-
-	c.fillDatabase(apps)
+	//commented for not filling the db
+	//c.fillDatabase(apps)
 	//fmt.Printf("Found [%d] Apps!", len(apps))
 
 	return apps

eventRouting/eventRouting_suite_test.go

@@ -5,13 +5,10 @@ import (
 	"sort"
 	"strings"
 	"sync"
-	"time"
 
 	"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/sumoCFFirehose"
-	"github.com/Sirupsen/logrus"
 	"github.com/cloudfoundry/sonde-go/events"
 )
 
@@ -20,16 +17,14 @@ type EventRouting struct {
 	selectedEvents      map[string]bool
 	selectedEventsCount map[string]uint64
 	mutex               *sync.Mutex
-	sLAppender          sumoCFFirehose.SumoLogicAppender //**
 	queue               *eventQueue.Queue
 }
 
-func NewEventRouting(caching caching.Caching, sLAppender sumoCFFirehose.SumoLogicAppender, queue *eventQueue.Queue) *EventRouting {
+func NewEventRouting(caching caching.Caching, queue *eventQueue.Queue) *EventRouting {
 	return &EventRouting{
 		CachingClient:       caching,
 		selectedEvents:      make(map[string]bool),
 		selectedEventsCount: make(map[string]uint64),
-		sLAppender:          sLAppender, //**
 		queue:               queue,
 		mutex:               &sync.Mutex{},
 	}
@@ -118,7 +113,7 @@ func GetListAuthorizedEventEvents() (authorizedEvents string) {
 	return strings.Join(arrEvents, ", ")
 }
 
-func (e *EventRouting) GetTotalCountOfSelectedEvents() uint64 {
+/*func (e *EventRouting) GetTotalCountOfSelectedEvents() uint64 {
 	var total = uint64(0)
 	for _, count := range e.GetSelectedEventsCount() {
 		total += count
@@ -148,9 +143,9 @@ func (e *EventRouting) LogEventTotals(logTotalsTime time.Duration) {
 			e.queue.Push(event)
 		}
 	}()
-}
+}*/
 
-func (e *EventRouting) getEventTotals(totalElapsedTime float64, elapsedTime float64, lastCount uint64) (*fevents.Event, uint64) {
+/*func (e *EventRouting) getEventTotals(totalElapsedTime float64, elapsedTime float64, lastCount uint64) (*fevents.Event, uint64) {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
 	totalCount := e.GetTotalCountOfSelectedEvents()
@@ -172,3 +167,4 @@ func (e *EventRouting) getEventTotals(totalElapsedTime float64, elapsedTime floa
 	event.AnnotateWithMetaData(map[string]string{})
 	return event, totalCount
 }
+*/

eventRouting/eventrouting.go

@@ -85,7 +85,7 @@ func main() {
 	go loggingClientSumo.Start() //multi
 
 	logging.Info.Println("Creating Events")
-	events := eventRouting.NewEventRouting(cachingClient, *loggingClientSumo, &queue)
+	events := eventRouting.NewEventRouting(cachingClient, &queue)
 	err := events.SetupEventRouting(*wantedEvents)
 	if err != nil {
 		logging.Error.Fatal("Error setting up event routing: ", err)

main.go

@@ -6,4 +6,8 @@ history:
 - 0.0.4
 - 0.0.5
 - 0.0.6
-version: 0.0.7
+- 0.0.7
+- 0.0.8
+- 0.0.9
+- 0.0.10
+version: 0.0.11