Merge pull request #238 from papertrail/module-aware

Use module-aware mode instead of GOPATH mode

.travis.yml

@@ -4,7 +4,6 @@ go:
 
 install:
   - export PATH=$HOME/gopath/bin:$PATH
-  - export GO15VENDOREXPERIMENT=1
 
 script:
   - make test

Makefile

@@ -1,5 +1,3 @@
-export GO15VENDOREXPERIMENT=1
-
 include packaging/Makefile.packaging
 
 .PHONY: depend clean test build tarball
@@ -70,15 +68,9 @@ endif
 	  exit 1; \
 	}
 
-	type govendor >/dev/null 2>&1|| { \
-	  echo "\033[1;33mgovendor is not installed. See https://github.com/kardianos/govendor\033[m"; \
-	  echo "$$ go get -u github.com/kardianos/govendor"; \
-	  exit 1; \
-	}
-
 	type gox >/dev/null 2>&1 || { \
 	  echo "\033[1;33mGox is not installed. See https://github.com/mitchellh/gox\033[m"; \
-	  echo "$$ go get github.com/mitchellh/gox"; \
+	  echo "$$ go install github.com/mitchellh/gox"; \
 	  exit 1; \
 	}
 

README.md

@@ -1,6 +1,6 @@
 # remote_syslog2
 
-[![Download remote_syslog2](http://papertrail.github.io/remote_syslog2/images/download.png)][releases]
+[![Download remote_syslog2](https://papertrail.github.io/remote_syslog2/images/download.png)][releases]
 
 remote_syslog tails one or more log files and sends syslog messages to a
 remote central syslog server. It generates packets itself, ignoring the system
@@ -190,7 +190,7 @@ the config file.
 
 External log rotation scripts often move or remove an existing log file
 and replace it with a new one (at a new inode). The Linux standard script
-[logrotate](http://iain.cx/src/logrotate/) supports a `copytruncate` config
+[logrotate](https://iain.cx/src/logrotate/) supports a `copytruncate` config
 option.  With that option, `logrotate` will copy files, operate on the copies,
 and truncate the original so that the inode remains the same.
 
@@ -207,7 +207,7 @@ Some logging programs such as Java's gclog (`-XX:+PrintGC` or `-verbose:gc`)
 do not log in append mode, so if another program such as `logrotate` (set to
 `copytruncate`) truncates the file, on the next write of the Java logger, the
 OS will fill the file with NUL bytes upto the current offset of the file descriptor.
-More info on that [here](http://stackoverflow.com/questions/8353401/garbage-collector-log-loggc-file-rotation-with-logrotate-does-not-work-properl).
+More info on that [here](https://stackoverflow.com/questions/8353401/garbage-collector-log-loggc-file-rotation-with-logrotate-does-not-work-properl).
 `remote_syslog` will detect those leading NUL bytes, discard them, and log the discard count.
 
 
@@ -244,7 +244,7 @@ additional instance(s). For example:
     --pid-file=/var/run/remote_syslog_2.pid
 
 Note: Daemonized programs use PID files to identify whether the program is already
-running ([more](http://unix.stackexchange.com/questions/12815/what-are-pid-and-lock-files-for/12818#12818)). Like other daemons, remote_syslog will refuse to run as a
+running ([more](https://unix.stackexchange.com/questions/12815/what-are-pid-and-lock-files-for/12818#12818)). Like other daemons, remote_syslog will refuse to run as a
 daemon (the default mode) when a PID file is present. If a .pid file is
 present but the daemon is not actually running, remove the PID file.
 
@@ -290,7 +290,7 @@ To send messages longer than 1024 characters, use TCP (either TLS or cleartext
 TCP) instead of UDP. See "[Sending messages securely](#sending-messages-securely)" to
 use TCP with TLS for messages of any length.
 
-[Here's why](http://help.papertrailapp.com/kb/configuration/troubleshooting-remote-syslog-reachability/#message-length) longer UDP messages are impossible to send over
+[Here's why](https://help.papertrailapp.com/kb/configuration/troubleshooting-remote-syslog-reachability/#message-length) longer UDP messages are impossible to send over
 the Internet.
 
 ### inotify
@@ -337,7 +337,7 @@ Once again, confirm that remote_syslog starts and then apply this value permanen
 
 * [Paul Morton](https://twitter.com/mortonpe)
 * [Papertrail](https://papertrailapp.com/) staff
-* [Paul Hammond](http://paulhammond.org/)
+* [Paul Hammond](https://paulhammond.org/)
 
 ## Reporting bugs
 
@@ -351,9 +351,8 @@ remote_syslog2 is written in go, and uses [govendor] to manage
 dependencies. To get everything set up, [install go][goinstall] then
 run:
 
-    go get github.com/kardianos/govendor
-    go get github.com/mitchellh/gox
-    go get github.com/papertrail/remote_syslog2
+    go install github.com/mitchellh/gox
+    git clone [email protected]:papertrail/remote_syslog2.git
 
 To run tests:
 
@@ -386,12 +385,12 @@ Once you've made your great commits:
 6. That's it!
 
 
-[Papertrail]: http://papertrailapp.com/
+[Papertrail]: https://papertrailapp.com/
 [remote_syslog]: https://github.com/papertrail/remote_syslog
 [releases]: https://github.com/papertrail/remote_syslog2/releases
 
 [govendor]: https://github.com/kardianos/govendor
-[goinstall]: http://golang.org/doc/install
+[goinstall]: https://golang.org/doc/install
 
-[fk]: http://help.github.com/forking/
+[fk]: https://help.github.com/forking/
 [is]: https://github.com/papertrail/remote_syslog/issues/

config_test.go

@@ -66,7 +66,7 @@ func TestRawConfig(t *testing.T) {
 	assert.Equal(c.Facility, fac)
 	assert.NotEqual(c.Hostname, "")
 	assert.Equal(c.Poll, false)
-	assert.Equal(c.RootCAs, papertrail.RootCA())
+	assert.Equal(c.RootCAs.Subjects(), papertrail.RootCA().Subjects())
 }
 
 func TestNoConfigFile(t *testing.T) {

examples/remote_syslog.ebextensions.config

@@ -1,4 +1,4 @@
-# See http://help.papertrailapp.com/kb/hosting-services/aws-elastic-beanstalk/
+# See https://help.papertrailapp.com/kb/hosting-services/aws-elastic-beanstalk/
 #
 # Usage:
 # - in "sources", replace <VERSION> with the version tag of remote_syslog2 to use (from https://github.com/papertrail/remote_syslog2/releases). For example, replace "<VERSION>" with "v0.18"

go.mod

@@ -0,0 +1,39 @@
+module github.com/papertrail/remote_syslog2
+
+go 1.17
+
+require (
+	github.com/VividCortex/godaemon v0.0.0-20131002161106-2fdf3f9fa715
+	github.com/howbazaar/loggo v0.0.0-20131030201820-384be4108823
+	github.com/mitchellh/gox v1.0.1
+	github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee
+	github.com/nightlyone/lockfile v0.0.0-20160306143149-b30dcbfa86e3
+	github.com/papertrail/go-tail v0.0.0-20170801201234-1b77c8dfcc6b
+	github.com/spf13/pflag v0.0.0-20160906134334-6fd2ff4ff8df
+	github.com/spf13/viper v0.0.0-20160830143246-16990631d4aa
+	github.com/stretchr/testify v1.1.4-0.20160615092844-d77da356e56a
+)
+
+require (
+	github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2 // indirect
+	github.com/fsnotify/fsnotify v1.3.2-0.20160816051541-f12c6236fe7b // indirect
+	github.com/hashicorp/go-version v1.0.0 // indirect
+	github.com/hashicorp/hcl v0.0.0-20160902165219-99df0eb941dd // indirect
+	github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169 // indirect
+	github.com/magiconair/properties v1.7.1-0.20160908093658-0723e352fa35 // indirect
+	github.com/mitchellh/iochan v1.0.0 // indirect
+	github.com/pelletier/go-buffruneio v0.1.0 // indirect
+	github.com/pelletier/go-toml v0.3.6-0.20160906202557-31055c2ff0bb // indirect
+	github.com/pkg/errors v0.7.1 // indirect
+	github.com/pkg/sftp v0.0.0-20160908100035-8197a2e58073 // indirect
+	github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0 // indirect
+	github.com/spf13/afero v0.0.0-20160821083612-20500e2abd0d // indirect
+	github.com/spf13/cast v0.0.0-20160730092037-e31f36ffc91a // indirect
+	github.com/spf13/jwalterweatherman v0.0.0-20160311093646-33c24e77fb80 // indirect
+	golang.org/x/crypto v0.0.0-20160909120217-05d11b2ca141 // indirect
+	golang.org/x/sys v0.0.0-20160429193239-b776ec39b3e5 // indirect
+	golang.org/x/text v0.0.0-20160908145610-1e65e9bf72c3 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/yaml.v2 v2.0.0-20160715033755-e4d366fc3c79 // indirect
+	launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect
+)

go.sum

@@ -0,0 +1,65 @@
+github.com/VividCortex/godaemon v0.0.0-20131002161106-2fdf3f9fa715 h1:0yPC4AyN7nFlSPjS1gKFFlOQRrhfbKlCEyVWK9CDY1E=
+github.com/VividCortex/godaemon v0.0.0-20131002161106-2fdf3f9fa715/go.mod h1:Y8CJ3IwPIAkMhv/rRUWIlczaeqd9ty9yrl+nc2AbaL4=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2 h1:5zdDAMuB3gvbHB1m2BZT9+t9w+xaBmK3ehb7skDXcwM=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fsnotify/fsnotify v1.3.2-0.20160816051541-f12c6236fe7b h1:clQtr7BsnoijdumdhlbbOGglPb1lIAJ3yTPjYOHlKdQ=
+github.com/fsnotify/fsnotify v1.3.2-0.20160816051541-f12c6236fe7b/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnnCPtE8=
+github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/hcl v0.0.0-20160902165219-99df0eb941dd h1:84QdurP28/GTPuAXatiouvNyhN9dflZY9KtMbatmupI=
+github.com/hashicorp/hcl v0.0.0-20160902165219-99df0eb941dd/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
+github.com/howbazaar/loggo v0.0.0-20131030201820-384be4108823 h1:RHchVj0Y4ojcJuXS6laqCtJtYq1HtFaRNyIGrPW3H3s=
+github.com/howbazaar/loggo v0.0.0-20131030201820-384be4108823/go.mod h1:qirP12TGqAYntqwePTIuFWWd1fHAeL8uMTel5GXqYDo=
+github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169 h1:YUrU1/jxRqnt0PSrKj1Uj/wEjk/fjnE80QFfi2Zlj7Q=
+github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169/go.mod h1:glhvuHOU9Hy7/8PwwdtnarXqLagOX0b/TbZx2zLMqEg=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/magiconair/properties v1.7.1-0.20160908093658-0723e352fa35 h1:WtkHGe1cgg+lvDj9p5CvjXrfopsIss0vIAz+/zeYZyQ=
+github.com/magiconair/properties v1.7.1-0.20160908093658-0723e352fa35/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI=
+github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4=
+github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY=
+github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee h1:kK7VuFVykgt0LfMSloWYjDOt4TnOcL0AxF0/rDq2VkM=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/nightlyone/lockfile v0.0.0-20160306143149-b30dcbfa86e3 h1:0n5k3UgMD17uNYeNw3njqRyfeCFemdDXbqkZzLTlNlw=
+github.com/nightlyone/lockfile v0.0.0-20160306143149-b30dcbfa86e3/go.mod h1:JbxfV1Iifij2yhRjXai0oFrbpxszXHRx1E5RuM26o4Y=
+github.com/papertrail/go-tail v0.0.0-20170801201234-1b77c8dfcc6b h1:I2e5p5inncWf3fsAlg6XseytuVfLyYHvygLi16JXh5s=
+github.com/papertrail/go-tail v0.0.0-20170801201234-1b77c8dfcc6b/go.mod h1:dMID0RaS2a5rhpOjC4RsAKitU6WGgkFBZnPVffL69b8=
+github.com/pelletier/go-buffruneio v0.1.0 h1:ig6N9Cg71k/P+UUbhwdOFtJWz+qa8/3by7AzMprMWBM=
+github.com/pelletier/go-buffruneio v0.1.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
+github.com/pelletier/go-toml v0.3.6-0.20160906202557-31055c2ff0bb h1:itpNy1S158xYBrFLYeyGyGjlds546+4bSNENlR5kcU4=
+github.com/pelletier/go-toml v0.3.6-0.20160906202557-31055c2ff0bb/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.7.1 h1:0XSZhzhcAUrs2vsv1y5jaxWejlCCgvxI/kBpbRFMZ+o=
+github.com/pkg/errors v0.7.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/sftp v0.0.0-20160908100035-8197a2e58073 h1:9PqYQCzKEbilrPJl3LDO16HdbA25Yqc3I25aUfgFaCs=
+github.com/pkg/sftp v0.0.0-20160908100035-8197a2e58073/go.mod h1:NxmoDg/QLVWluQDUYG7XBZTLUpKeFa8e3aMf1BfjyHk=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0 h1:GD+A8+e+wFkqje55/2fOVnZPkoDIu1VooBWfNrnY8Uo=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/spf13/afero v0.0.0-20160821083612-20500e2abd0d h1:sd1qRX4NJPdIHizg+E7cK0kFaJRjwfJFQyUJUguwIak=
+github.com/spf13/afero v0.0.0-20160821083612-20500e2abd0d/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v0.0.0-20160730092037-e31f36ffc91a h1:tPI5RnYZJhcXj0LhJ9pi7PS7gqOhuFR+4HEKyDz3BnQ=
+github.com/spf13/cast v0.0.0-20160730092037-e31f36ffc91a/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
+github.com/spf13/jwalterweatherman v0.0.0-20160311093646-33c24e77fb80 h1:evyGXhHMrxKBDkdlSPv9HMWV2o53o+Ibhm28BGc0450=
+github.com/spf13/jwalterweatherman v0.0.0-20160311093646-33c24e77fb80/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v0.0.0-20160906134334-6fd2ff4ff8df h1:i6BcnijncbnhvDqNliGST7mq6VUAw/npzYAnDWaAB+M=
+github.com/spf13/pflag v0.0.0-20160906134334-6fd2ff4ff8df/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v0.0.0-20160830143246-16990631d4aa h1:+yZESdfzohzq0Jtw+Cqbc8DzjoodNv3CB+BOww04drs=
+github.com/spf13/viper v0.0.0-20160830143246-16990631d4aa/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
+github.com/stretchr/testify v1.1.4-0.20160615092844-d77da356e56a h1:UWu0XgfW9PCuyeZYNe2eGGkDZjooQKjVQqY/+d/jYmc=
+github.com/stretchr/testify v1.1.4-0.20160615092844-d77da356e56a/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+golang.org/x/crypto v0.0.0-20160909120217-05d11b2ca141 h1:7qMu/IWpY+cfuLMEenVOnMwny1+DNavuX7qeKfImV0c=
+golang.org/x/crypto v0.0.0-20160909120217-05d11b2ca141/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/sys v0.0.0-20160429193239-b776ec39b3e5 h1:L+w9B2AS0iNfWhpTtG2zRCYDSSdWo4VJZGbSgvMIxo0=
+golang.org/x/sys v0.0.0-20160429193239-b776ec39b3e5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.0.0-20160908145610-1e65e9bf72c3 h1:zvaOCkN7IYkuMpwoiyZaMcIT+kVKgA6KGUdl0quo6QQ=
+golang.org/x/text v0.0.0-20160908145610-1e65e9bf72c3/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v2 v2.0.0-20160715033755-e4d366fc3c79 h1:mENkfeXGmLV7lIyBeNdwYWdONek7pH9yHaHMgZyvIWE=
+gopkg.in/yaml.v2 v2.0.0-20160715033755-e4d366fc3c79/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
+launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54=
+launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM=

tools.go

@@ -0,0 +1,5 @@
+//go:build tools
+
+package tools
+
+import _ "github.com/mitchellh/gox"