Changed imports and vendored packages to use the upstream github.com/…

…coreos/go-systemd
mheese · Jan 13, 2017 · 95c8a3c · 95c8a3c
1 parent 332eee2
commit 95c8a3c
Show file tree

Hide file tree

Showing 8 changed files with 200 additions and 9 deletions.
diff --git a/beater/convert.go b/beater/convert.go
@@ -18,8 +18,8 @@ import (
  "strconv"
  "strings"
 
+ "github.com/coreos/go-systemd/sdjournal"
  "github.com/elastic/beats/libbeat/common"
- "github.com/nicorevin/go-systemd/sdjournal"
 )
 
 // MapStrFromJournalEntry takes a JournalD entry and converts it to an event

diff --git a/beater/journalbeat.go b/beater/journalbeat.go
@@ -19,13 +19,13 @@ import (
  "io/ioutil"
  "time"
 
+ "github.com/coreos/go-systemd/sdjournal"
  "github.com/elastic/beats/libbeat/beat"
  "github.com/elastic/beats/libbeat/common"
  "github.com/elastic/beats/libbeat/logp"
  "github.com/elastic/beats/libbeat/publisher"
  "github.com/mheese/journalbeat/config"
  "github.com/mheese/journalbeat/journal"
- "github.com/nicorevin/go-systemd/sdjournal"
 )
 
 // Journalbeat is the main Journalbeat struct

diff --git a/journal/follow.go b/journal/follow.go
@@ -18,8 +18,8 @@ import (
  "io"
  "time"
 
+ "github.com/coreos/go-systemd/sdjournal"
  "github.com/elastic/beats/libbeat/logp"
- "github.com/nicorevin/go-systemd/sdjournal"
 )
 
 // SD_JOURNAL_FIELD_CATALOG_ENTRY stores the name of the JournalEntry field to export Catalog entry to.

diff --git a/vendor/github.com/coreos/go-systemd/LICENSE b/vendor/github.com/coreos/go-systemd/LICENSE
diff --git a/...corevin/go-systemd/sdjournal/functions.go → .../coreos/go-systemd/sdjournal/functions.go b/...corevin/go-systemd/sdjournal/functions.go → .../coreos/go-systemd/sdjournal/functions.go
diff --git a/...nicorevin/go-systemd/sdjournal/journal.go → ...om/coreos/go-systemd/sdjournal/journal.go b/...nicorevin/go-systemd/sdjournal/journal.go → ...om/coreos/go-systemd/sdjournal/journal.go
diff --git a/...om/nicorevin/go-systemd/sdjournal/read.go → ...b.com/coreos/go-systemd/sdjournal/read.go b/...om/nicorevin/go-systemd/sdjournal/read.go → ...b.com/coreos/go-systemd/sdjournal/read.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -8,6 +8,12 @@
  "revision": "9418d7c7189af6ea2df537692f9428efe1368368",
  "revisionTime": "2016-12-15T15:18:51Z"
  },
+ {
+ "checksumSHA1": "u7jr6ys5VV/ywoauQ3YQZJs1yO8=",
+ "path": "github.com/coreos/go-systemd/sdjournal",
+ "revision": "7f737a6bd38784c73b5bf5cd54d9b1d23295e3a0",
+ "revisionTime": "2017-01-13T10:31:45Z"
+ },
  {
  "checksumSHA1": "O8c/VKtW34XPJNNlyeb/im8vWSI=",
  "path": "github.com/coreos/pkg/dlopen",
@@ -380,12 +386,6 @@
  "revision": "cb6bfca970f6908083f26f39a79009d608efd5cd",
  "revisionTime": "2016-10-16T15:41:25Z"
  },
- {
- "checksumSHA1": "xojkgrlzL3jnLk0rF31cvhtm8DE=",
- "path": "github.com/nicorevin/go-systemd/sdjournal",
- "revision": "2f8dc22e46890b270c00006fdb6cc033f4db2c4f",
- "revisionTime": "2017-01-09T22:39:12Z"
- },
  {
  "checksumSHA1": "FlEI/BO8wk8bZR0Gz7OfwSaNZ0s=",
  "path": "github.com/nranchev/go-libGeoIP",