Skip to content

return error #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

return error #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5d4c43
add return error
Jan 11, 2018
0f34672
add return error
Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 14 additions & 8 deletions gelf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ func New(config Config) *Gelf {
return g
}

func (g *Gelf) Log(message string) {
func (g *Gelf) Log(message string) error {
msgJson := g.ParseJson(message)

err := g.TestForForbiddenValues(msgJson)
if err != nil {
log.Printf("Uh oh! %s", err)
return
return err
}

compressed := g.Compress([]byte(message))
Expand All @@ -81,12 +81,17 @@ func (g *Gelf) Log(message string) {

for i, index := 0, 0; i < length; i, index = i+chunksize, index+1 {
packet := g.CreateChunkedMessage(index, chunkCountInt, id, &compressed)
g.Send(packet.Bytes())
err = g.Send(packet.Bytes())
if err != nil {
return err
}
}

} else {
g.Send(compressed.Bytes())
return g.Send(compressed.Bytes())
}

return nil
}

func (g *Gelf) CreateChunkedMessage(index int, chunkCountInt int, id []byte, compressed *bytes.Buffer) bytes.Buffer {
Expand Down Expand Up @@ -156,17 +161,18 @@ func (g *Gelf) TestForForbiddenValues(gmap map[string]interface{}) error {
return nil
}

func (g *Gelf) Send(b []byte) {
func (g *Gelf) Send(b []byte) error {
var addr = g.Config.GraylogHostname + ":" + strconv.Itoa(g.Config.GraylogPort)
udpAddr, err := net.ResolveUDPAddr("udp", addr)
if err != nil {
log.Printf("Uh oh! %s", err)
return
return err
}
conn, err := net.DialUDP("udp", nil, udpAddr)
if err != nil {
log.Printf("Uh oh! %s", err)
return
return err
}
conn.Write(b)
_, err = conn.Write(b)
return err
}