Skip to content

Commit a50dd4c

Browse files
committed
SCFF-29 calling the appender after queue contains N Events
1 parent 76a9d81 commit a50dd4c

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

eventQueue/eventQueue.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ func (q *Queue) GetNode() []*Node {
3333
return q.nodes
3434
}
3535

36+
func (n *Queue) GetCount() int {
37+
return n.count
38+
}
39+
3640
func (n *Node) GetNodeEvent() Event {
3741
return n.event
3842
}

eventRouting/eventrouting.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,15 @@ func (e *EventRouting) RouteEvent(msg *events.Envelope) {
7575
if ignored, hasIgnoredField := event.Fields["cf_ignored_app"]; ignored == true && hasIgnoredField {
7676
e.selectedEventsCount["ignored_app_message"]++
7777
} else {
78-
if e.queue.Pop() != nil { //if the queue is not empty
78+
if e.queue.GetCount() == 10 { //if the queue has 10 elements, send to the appender (10 elements to wait to send to the appender?)
7979
fmt.Println("sendig event from queue to appender")
8080
e.sLAppender.AppendLogs(e.queue.Pop().GetNodeEvent()) // send to appender event from queue
8181
} else { //if the queue is empty, send the event to queue
82-
fmt.Println(event.Msg)
83-
fmt.Println("sendig event TO queue")
82+
/*fmt.Println(event.Fields["timestamp"])
83+
fmt.Println("sendig event TO queue")*/
8484
e.queue.Push(eventQueue.NewNode(*event))
8585
}
86+
8687
e.selectedEventsCount[eventType.String()]++
8788

8889
}

sumoCFFirehose/sumoLogicAppender.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"net/http"
88
"time"
99

10+
//"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/eventQueue"
1011
. "bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/events"
1112
)
1213

@@ -55,7 +56,7 @@ func (s *SumoLogicAppender) AppendLogs(event Event) {
5556
return
5657
}
5758

58-
Message := /*strconv.Itoa(fields["timestamp"]) + */ "\t" + event.Fields["message_type"].(string) + "\t" + event.Msg
59+
Message := /*strconv.Itoa(fields["timestamp"]) + */ "\t" + event.Fields["message_type"].(string) + "\t" + event.Msg + "\n"
5960
s.SendToSumo(Message)
6061
}
6162

0 commit comments

Comments
 (0)