clenaup and update paths

mcuadros · Apr 25, 2016 · 280fd46 · 280fd46
1 parent a2d3207
commit 280fd46
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 140 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,13 @@ go:
  - 1.6
  - tip
 
+install:
+ - rm -rf $GOPATH/src/gopkg.in/mcuadros
+ - mkdir -p $GOPATH/src/gopkg.in/mcuadros
+ - ln -s $PWD $GOPATH/src/gopkg.in/mcuadros/go-syslog.v2
+ - cd $GOPATH/src/gopkg.in/mcuadros/go-syslog.v2 && go get -v -t ./...
+
 script:
- - go test -v ./...
+ - cd $GOPATH/src/gopkg.in/mcuadros/go-syslog.v2 && go test -v ./...
 
 sudo: false
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-go-syslog [![Build Status](https://travis-ci.org/mcuadros/go-syslog.png?branch=master)](https://travis-ci.org/mcuadros/go-syslog) [![GoDoc](http://godoc.org/github.com/mcuadros/go-syslog?status.png)](http://godoc.org/github.com/mcuadros/go-syslog) [![GitHub release](https://img.shields.io/github/release/mcuadros/go-syslog.svg)](https://github.com/mcuadros/go-syslog/releases)
+go-syslog [![Build Status](https://travis-ci.org/mcuadros/go-syslog.png?branch=master)](https://travis-ci.org/mcuadros/go-syslog) [![GoDoc](http://godoc.org/github.com/mcuadros/go-syslog?status.png)](hhttps://godoc.org/gopkg.in/mcuadros/go-syslog.v2) [![GitHub release](https://img.shields.io/github/release/mcuadros/go-syslog.svg)](https://github.com/mcuadros/go-syslog/releases)
 ==============================
 
 Syslog server library for go, build easy your custom syslog server over UDP, TCP or Unix sockets using RFC3164, RFC6587 or RFC5424

diff --git a/doc.go b/doc.go
@@ -1,5 +1,5 @@
 /*
 Syslog server library for go, build easy your custom syslog server
-over UDP, TCP or Unix sockets using RFC3164 or RFC5424
+over UDP, TCP or Unix sockets using RFC3164, RFC5424 and RFC6587
 */
-package syslog
+package syslog // import "gopkg.in/mcuadros/go-syslog.v2"
diff --git a/format/automatic.go b/format/automatic.go
@@ -6,9 +6,9 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/Xiol/syslogparser"
-	"github.com/Xiol/syslogparser/rfc3164"
-	"github.com/Xiol/syslogparser/rfc5424"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser/rfc3164"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser/rfc5424"
 )
 
 /* Selecting an 'Automatic' format detects incoming format (i.e. RFC3164 vs RFC5424) and Framing

diff --git a/format/format.go b/format/format.go
@@ -3,7 +3,7 @@ package format
 import (
 	"bufio"
 
-	"github.com/Xiol/syslogparser"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
 )
 
 type Format interface {

diff --git a/format/rfc3164.go b/format/rfc3164.go
@@ -3,8 +3,8 @@ package format
 import (
 	"bufio"
 
-	"github.com/Xiol/syslogparser"
-	"github.com/Xiol/syslogparser/rfc3164"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser/rfc3164"
 )
 
 type RFC3164 struct{}

diff --git a/format/rfc5424.go b/format/rfc5424.go
@@ -3,8 +3,8 @@ package format
 import (
 	"bufio"
 
-	"github.com/Xiol/syslogparser"
-	"github.com/Xiol/syslogparser/rfc5424"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser/rfc5424"
 )
 
 type RFC5424 struct{}

diff --git a/format/rfc6587.go b/format/rfc6587.go
@@ -5,8 +5,8 @@ import (
 	"bytes"
 	"strconv"
 
-	"github.com/Xiol/syslogparser"
-	"github.com/Xiol/syslogparser/rfc5424"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser/rfc5424"
 )
 
 type RFC6587 struct{}

diff --git a/handler.go b/handler.go
@@ -1,7 +1,7 @@
 package syslog
 
 import (
-	"github.com/Xiol/syslogparser"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
 )
 
 //The handler receive every syslog entry at Handle method

diff --git a/handler_test.go b/handler_test.go
@@ -1,8 +1,8 @@
 package syslog
 
 import (
-	"github.com/Xiol/syslogparser"
 	. "gopkg.in/check.v1"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
 )
 
 type HandlerSuite struct{}

diff --git a/internal/syslogparser/.gitignore b/internal/syslogparser/.gitignore
diff --git a/internal/syslogparser/Makefile b/internal/syslogparser/Makefile
diff --git a/internal/syslogparser/README b/internal/syslogparser/README
diff --git a/internal/syslogparser/README.md b/internal/syslogparser/README.md
@@ -0,0 +1,4 @@
+Syslogparser
+============
+
+This is a fork for [github.com/jeromer/syslogparser](https://github.com/jeromer/syslogparser), since this library is intensively used by `go-syslog`, now is integrated as a `internal` package.
diff --git a/internal/syslogparser/dependencies.txt b/internal/syslogparser/dependencies.txt
diff --git a/internal/syslogparser/rfc3164/example_test.go b/internal/syslogparser/rfc3164/example_test.go
@@ -2,7 +2,8 @@ package rfc3164_test
 
 import (
 	"fmt"
-	"github.com/Xiol/syslogparser/rfc3164"
+
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser/rfc3164"
 )
 
 func ExampleNewParser() {

diff --git a/internal/syslogparser/rfc3164/rfc3164.go b/internal/syslogparser/rfc3164/rfc3164.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"time"
 
-	"github.com/Xiol/syslogparser"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
 )
 
 type Parser struct {

diff --git a/internal/syslogparser/rfc3164/rfc3164_test.go b/internal/syslogparser/rfc3164/rfc3164_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Xiol/syslogparser"
 	. "gopkg.in/check.v1"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
 )
 
 // Hooks up gocheck into the gotest runner.

diff --git a/internal/syslogparser/rfc5424/example_test.go b/internal/syslogparser/rfc5424/example_test.go
@@ -2,7 +2,8 @@ package rfc5424_test
 
 import (
 	"fmt"
-	"github.com/Xiol/syslogparser/rfc5424"
+
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser/rfc5424"
 )
 
 func ExampleNewParser() {

diff --git a/internal/syslogparser/rfc5424/rfc5424.go b/internal/syslogparser/rfc5424/rfc5424.go
@@ -5,10 +5,11 @@ package rfc5424
 
 import (
 	"fmt"
-	"github.com/Xiol/syslogparser"
 	"math"
 	"strconv"
 	"time"
+
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
 )
 
 const (

diff --git a/internal/syslogparser/rfc5424/rfc5424_test.go b/internal/syslogparser/rfc5424/rfc5424_test.go
@@ -2,10 +2,11 @@ package rfc5424
 
 import (
 	"fmt"
-	"github.com/Xiol/syslogparser"
-	. "gopkg.in/check.v1"
 	"testing"
 	"time"
+
+	. "gopkg.in/check.v1"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
 )
 
 // Hooks up gocheck into the gotest runner.

diff --git a/internal/syslogparser/syslogparser_test.go b/internal/syslogparser/syslogparser_test.go
@@ -1,8 +1,9 @@
 package syslogparser
 
 import (
-	. "gopkg.in/check.v1"
 	"testing"
+
+	. "gopkg.in/check.v1"
 )
 
 // Hooks up gocheck into the gotest runner.

diff --git a/server.go b/server.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Xiol/go-syslog/format"
+	"gopkg.in/mcuadros/go-syslog.v2/format"
 )
 
 var (

diff --git a/server_test.go b/server_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Xiol/syslogparser"
 	. "gopkg.in/check.v1"
+	"gopkg.in/mcuadros/go-syslog.v2/internal/syslogparser"
 )
 
 func Test(t *testing.T) { TestingT(t) }