From d2ff4407993e4511e0225c12964bc07cd8d02be6 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Fri, 19 Oct 2018 06:58:02 -0700 Subject: use GOPROXY --- Dockerfile | 9 +- vendor/github.com/Xe/gopreload/.gitignore | 1 - vendor/github.com/Xe/gopreload/LICENSE | 19 - vendor/github.com/Xe/gopreload/README.md | 51 - vendor/github.com/Xe/gopreload/doc.go | 7 - vendor/github.com/Xe/gopreload/preload.go | 26 - vendor/github.com/Xe/jsonfeed/.travis.yml | 17 - vendor/github.com/Xe/jsonfeed/LICENSE | 363 --- vendor/github.com/Xe/jsonfeed/README.md | 8 - vendor/github.com/Xe/jsonfeed/jsonfeed.go | 73 - vendor/github.com/Xe/ln/LICENSE | 25 - vendor/github.com/Xe/ln/README.md | 29 - vendor/github.com/Xe/ln/action.go | 11 - vendor/github.com/Xe/ln/context.go | 38 - vendor/github.com/Xe/ln/doc.go | 25 - vendor/github.com/Xe/ln/filter.go | 67 - vendor/github.com/Xe/ln/formatter.go | 111 - vendor/github.com/Xe/ln/logger.go | 180 -- vendor/github.com/Xe/ln/stack.go | 44 - vendor/github.com/google/gops/LICENSE | 27 - vendor/github.com/google/gops/agent/agent.go | 237 -- vendor/github.com/google/gops/internal/internal.go | 52 - vendor/github.com/google/gops/signal/signal.go | 35 - vendor/github.com/gorilla/feeds/.travis.yml | 15 - vendor/github.com/gorilla/feeds/LICENSE | 22 - vendor/github.com/gorilla/feeds/README.md | 184 -- vendor/github.com/gorilla/feeds/atom.go | 164 -- vendor/github.com/gorilla/feeds/doc.go | 73 - vendor/github.com/gorilla/feeds/feed.go | 135 - vendor/github.com/gorilla/feeds/json.go | 181 -- vendor/github.com/gorilla/feeds/rss.go | 154 -- vendor/github.com/gorilla/feeds/to-implement.md | 20 - vendor/github.com/gorilla/feeds/uuid.go | 27 - vendor/github.com/kardianos/osext/LICENSE | 27 - vendor/github.com/kardianos/osext/README.md | 21 - vendor/github.com/kardianos/osext/osext.go | 33 - vendor/github.com/kardianos/osext/osext_go18.go | 9 - vendor/github.com/kardianos/osext/osext_plan9.go | 22 - vendor/github.com/kardianos/osext/osext_procfs.go | 36 - vendor/github.com/kardianos/osext/osext_sysctl.go | 126 - vendor/github.com/kardianos/osext/osext_windows.go | 36 - vendor/github.com/pkg/errors/.gitignore | 24 - vendor/github.com/pkg/errors/.travis.yml | 11 - vendor/github.com/pkg/errors/LICENSE | 23 - vendor/github.com/pkg/errors/README.md | 52 - vendor/github.com/pkg/errors/appveyor.yml | 32 - vendor/github.com/pkg/errors/errors.go | 269 -- vendor/github.com/pkg/errors/stack.go | 178 -- vendor/github.com/russross/blackfriday/.gitignore | 8 - vendor/github.com/russross/blackfriday/.travis.yml | 18 - vendor/github.com/russross/blackfriday/LICENSE.txt | 29 - vendor/github.com/russross/blackfriday/README.md | 283 -- vendor/github.com/russross/blackfriday/block.go | 1549 ----------- vendor/github.com/russross/blackfriday/doc.go | 18 - vendor/github.com/russross/blackfriday/esc.go | 34 - vendor/github.com/russross/blackfriday/html.go | 940 ------- vendor/github.com/russross/blackfriday/inline.go | 1214 --------- vendor/github.com/russross/blackfriday/markdown.go | 940 ------- vendor/github.com/russross/blackfriday/node.go | 354 --- .../github.com/russross/blackfriday/smartypants.go | 457 ---- vendor/github.com/segmentio/backo-go/.gitmodules | 3 - vendor/github.com/segmentio/backo-go/README.md | 80 - vendor/github.com/segmentio/backo-go/backo.go | 83 - .../shurcooL/sanitized_anchor_name/.travis.yml | 16 - .../shurcooL/sanitized_anchor_name/LICENSE | 21 - .../shurcooL/sanitized_anchor_name/README.md | 36 - .../shurcooL/sanitized_anchor_name/main.go | 29 - vendor/github.com/tj/front/Readme.md | 16 - vendor/github.com/tj/front/front.go | 24 - vendor/github.com/xtgo/uuid/AUTHORS | 5 - vendor/github.com/xtgo/uuid/LICENSE | 27 - vendor/github.com/xtgo/uuid/uuid.go | 204 -- .../gopkg.in/segmentio/analytics-go.v3/.gitignore | 32 - .../gopkg.in/segmentio/analytics-go.v3/.gitmodules | 6 - .../gopkg.in/segmentio/analytics-go.v3/History.md | 70 - .../gopkg.in/segmentio/analytics-go.v3/License.md | 21 - vendor/gopkg.in/segmentio/analytics-go.v3/Makefile | 26 - .../gopkg.in/segmentio/analytics-go.v3/Readme.md | 55 - vendor/gopkg.in/segmentio/analytics-go.v3/alias.go | 38 - .../segmentio/analytics-go.v3/analytics.go | 388 --- .../gopkg.in/segmentio/analytics-go.v3/config.go | 173 -- .../gopkg.in/segmentio/analytics-go.v3/context.go | 148 -- vendor/gopkg.in/segmentio/analytics-go.v3/error.go | 60 - .../gopkg.in/segmentio/analytics-go.v3/executor.go | 53 - vendor/gopkg.in/segmentio/analytics-go.v3/group.go | 40 - .../gopkg.in/segmentio/analytics-go.v3/identify.go | 31 - .../segmentio/analytics-go.v3/integrations.go | 44 - vendor/gopkg.in/segmentio/analytics-go.v3/json.go | 87 - .../gopkg.in/segmentio/analytics-go.v3/logger.go | 47 - .../gopkg.in/segmentio/analytics-go.v3/message.go | 128 - vendor/gopkg.in/segmentio/analytics-go.v3/page.go | 32 - .../segmentio/analytics-go.v3/properties.go | 117 - .../gopkg.in/segmentio/analytics-go.v3/screen.go | 32 - .../segmentio/analytics-go.v3/timeout_15.go | 16 - .../segmentio/analytics-go.v3/timeout_16.go | 10 - vendor/gopkg.in/segmentio/analytics-go.v3/track.go | 40 - .../gopkg.in/segmentio/analytics-go.v3/traits.go | 89 - vendor/gopkg.in/yaml.v1/LICENSE | 188 -- vendor/gopkg.in/yaml.v1/LICENSE.libyaml | 31 - vendor/gopkg.in/yaml.v1/README.md | 128 - vendor/gopkg.in/yaml.v1/apic.go | 742 ------ vendor/gopkg.in/yaml.v1/decode.go | 566 ---- vendor/gopkg.in/yaml.v1/emitterc.go | 1685 ------------ vendor/gopkg.in/yaml.v1/encode.go | 265 -- vendor/gopkg.in/yaml.v1/parserc.go | 1096 -------- vendor/gopkg.in/yaml.v1/readerc.go | 391 --- vendor/gopkg.in/yaml.v1/resolve.go | 190 -- vendor/gopkg.in/yaml.v1/scannerc.go | 2710 -------------------- vendor/gopkg.in/yaml.v1/sorter.go | 104 - vendor/gopkg.in/yaml.v1/writerc.go | 89 - vendor/gopkg.in/yaml.v1/yaml.go | 301 --- vendor/gopkg.in/yaml.v1/yamlh.go | 716 ------ vendor/gopkg.in/yaml.v1/yamlprivateh.go | 173 -- vendor/modules.txt | 30 - 114 files changed, 5 insertions(+), 20900 deletions(-) delete mode 100644 vendor/github.com/Xe/gopreload/.gitignore delete mode 100644 vendor/github.com/Xe/gopreload/LICENSE delete mode 100644 vendor/github.com/Xe/gopreload/README.md delete mode 100644 vendor/github.com/Xe/gopreload/doc.go delete mode 100644 vendor/github.com/Xe/gopreload/preload.go delete mode 100644 vendor/github.com/Xe/jsonfeed/.travis.yml delete mode 100644 vendor/github.com/Xe/jsonfeed/LICENSE delete mode 100644 vendor/github.com/Xe/jsonfeed/README.md delete mode 100644 vendor/github.com/Xe/jsonfeed/jsonfeed.go delete mode 100644 vendor/github.com/Xe/ln/LICENSE delete mode 100644 vendor/github.com/Xe/ln/README.md delete mode 100644 vendor/github.com/Xe/ln/action.go delete mode 100644 vendor/github.com/Xe/ln/context.go delete mode 100644 vendor/github.com/Xe/ln/doc.go delete mode 100644 vendor/github.com/Xe/ln/filter.go delete mode 100644 vendor/github.com/Xe/ln/formatter.go delete mode 100644 vendor/github.com/Xe/ln/logger.go delete mode 100644 vendor/github.com/Xe/ln/stack.go delete mode 100644 vendor/github.com/google/gops/LICENSE delete mode 100644 vendor/github.com/google/gops/agent/agent.go delete mode 100644 vendor/github.com/google/gops/internal/internal.go delete mode 100644 vendor/github.com/google/gops/signal/signal.go delete mode 100644 vendor/github.com/gorilla/feeds/.travis.yml delete mode 100644 vendor/github.com/gorilla/feeds/LICENSE delete mode 100644 vendor/github.com/gorilla/feeds/README.md delete mode 100644 vendor/github.com/gorilla/feeds/atom.go delete mode 100644 vendor/github.com/gorilla/feeds/doc.go delete mode 100644 vendor/github.com/gorilla/feeds/feed.go delete mode 100644 vendor/github.com/gorilla/feeds/json.go delete mode 100644 vendor/github.com/gorilla/feeds/rss.go delete mode 100644 vendor/github.com/gorilla/feeds/to-implement.md delete mode 100644 vendor/github.com/gorilla/feeds/uuid.go delete mode 100644 vendor/github.com/kardianos/osext/LICENSE delete mode 100644 vendor/github.com/kardianos/osext/README.md delete mode 100644 vendor/github.com/kardianos/osext/osext.go delete mode 100644 vendor/github.com/kardianos/osext/osext_go18.go delete mode 100644 vendor/github.com/kardianos/osext/osext_plan9.go delete mode 100644 vendor/github.com/kardianos/osext/osext_procfs.go delete mode 100644 vendor/github.com/kardianos/osext/osext_sysctl.go delete mode 100644 vendor/github.com/kardianos/osext/osext_windows.go delete mode 100644 vendor/github.com/pkg/errors/.gitignore delete mode 100644 vendor/github.com/pkg/errors/.travis.yml delete mode 100644 vendor/github.com/pkg/errors/LICENSE delete mode 100644 vendor/github.com/pkg/errors/README.md delete mode 100644 vendor/github.com/pkg/errors/appveyor.yml delete mode 100644 vendor/github.com/pkg/errors/errors.go delete mode 100644 vendor/github.com/pkg/errors/stack.go delete mode 100644 vendor/github.com/russross/blackfriday/.gitignore delete mode 100644 vendor/github.com/russross/blackfriday/.travis.yml delete mode 100644 vendor/github.com/russross/blackfriday/LICENSE.txt delete mode 100644 vendor/github.com/russross/blackfriday/README.md delete mode 100644 vendor/github.com/russross/blackfriday/block.go delete mode 100644 vendor/github.com/russross/blackfriday/doc.go delete mode 100644 vendor/github.com/russross/blackfriday/esc.go delete mode 100644 vendor/github.com/russross/blackfriday/html.go delete mode 100644 vendor/github.com/russross/blackfriday/inline.go delete mode 100644 vendor/github.com/russross/blackfriday/markdown.go delete mode 100644 vendor/github.com/russross/blackfriday/node.go delete mode 100644 vendor/github.com/russross/blackfriday/smartypants.go delete mode 100644 vendor/github.com/segmentio/backo-go/.gitmodules delete mode 100644 vendor/github.com/segmentio/backo-go/README.md delete mode 100644 vendor/github.com/segmentio/backo-go/backo.go delete mode 100644 vendor/github.com/shurcooL/sanitized_anchor_name/.travis.yml delete mode 100644 vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE delete mode 100644 vendor/github.com/shurcooL/sanitized_anchor_name/README.md delete mode 100644 vendor/github.com/shurcooL/sanitized_anchor_name/main.go delete mode 100644 vendor/github.com/tj/front/Readme.md delete mode 100644 vendor/github.com/tj/front/front.go delete mode 100644 vendor/github.com/xtgo/uuid/AUTHORS delete mode 100644 vendor/github.com/xtgo/uuid/LICENSE delete mode 100644 vendor/github.com/xtgo/uuid/uuid.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/.gitignore delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/.gitmodules delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/History.md delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/License.md delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/Makefile delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/Readme.md delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/alias.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/analytics.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/config.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/context.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/error.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/executor.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/group.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/identify.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/integrations.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/json.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/logger.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/message.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/page.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/properties.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/screen.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/timeout_15.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/timeout_16.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/track.go delete mode 100644 vendor/gopkg.in/segmentio/analytics-go.v3/traits.go delete mode 100644 vendor/gopkg.in/yaml.v1/LICENSE delete mode 100644 vendor/gopkg.in/yaml.v1/LICENSE.libyaml delete mode 100644 vendor/gopkg.in/yaml.v1/README.md delete mode 100644 vendor/gopkg.in/yaml.v1/apic.go delete mode 100644 vendor/gopkg.in/yaml.v1/decode.go delete mode 100644 vendor/gopkg.in/yaml.v1/emitterc.go delete mode 100644 vendor/gopkg.in/yaml.v1/encode.go delete mode 100644 vendor/gopkg.in/yaml.v1/parserc.go delete mode 100644 vendor/gopkg.in/yaml.v1/readerc.go delete mode 100644 vendor/gopkg.in/yaml.v1/resolve.go delete mode 100644 vendor/gopkg.in/yaml.v1/scannerc.go delete mode 100644 vendor/gopkg.in/yaml.v1/sorter.go delete mode 100644 vendor/gopkg.in/yaml.v1/writerc.go delete mode 100644 vendor/gopkg.in/yaml.v1/yaml.go delete mode 100644 vendor/gopkg.in/yaml.v1/yamlh.go delete mode 100644 vendor/gopkg.in/yaml.v1/yamlprivateh.go delete mode 100644 vendor/modules.txt diff --git a/Dockerfile b/Dockerfile index 32c4993..2c6ee52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ -FROM xena/go:1.11 AS build -COPY . /root/go/src/github.com/Xe/site -WORKDIR /root/go/src/github.com/Xe/site -RUN GO111MODULE=on CGO_ENABLED=0 GOBIN=/root go install -v -mod=vendor ./cmd/site +FROM xena/go:1.11.1 AS build +ENV GOPROXY https://cache.greedo.xeserv.us +COPY . /site +WORKDIR /site +RUN CGO_ENABLED=0 GOBIN=/root go install -v ./cmd/site FROM xena/alpine EXPOSE 5000 diff --git a/vendor/github.com/Xe/gopreload/.gitignore b/vendor/github.com/Xe/gopreload/.gitignore deleted file mode 100644 index 140f8cf..0000000 --- a/vendor/github.com/Xe/gopreload/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.so diff --git a/vendor/github.com/Xe/gopreload/LICENSE b/vendor/github.com/Xe/gopreload/LICENSE deleted file mode 100644 index 82248fe..0000000 --- a/vendor/github.com/Xe/gopreload/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2017 Christine Dodrill - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/vendor/github.com/Xe/gopreload/README.md b/vendor/github.com/Xe/gopreload/README.md deleted file mode 100644 index 32a3e5d..0000000 --- a/vendor/github.com/Xe/gopreload/README.md +++ /dev/null @@ -1,51 +0,0 @@ -gopreload -========= - -An emulation of the linux libc `LD_PRELOAD` except for use with Go plugins for -the addition of instrumentation and debugging utilities. - -## Pluginizer - -`pluginizer` is a bit of glue that makes it easier to turn underscore imports -into plugins: - -```console -$ go get github.com/Xe/gopreload/cmd/pluginizer -$ pluginizer -help -Usage of pluginizer: - -dest string - destination package to generate - -pkg string - package to underscore import -$ pluginizer -pkg github.com/lib/pq -dest github.com/Xe/gopreload/database/postgres -To build this plugin: - $ go build -buildmode plugin -o /path/to/output.so github.com/Xe/gopreload/database/postgres -``` - -### Database drivers - -I have included plugin boilerplate autogenned versions of the sqlite, postgres -and mysql database drivers. - -## Manhole - -[`manhole`][manhole] is an example of debugging and introspection tooling that has -been useful when debugging past issues with long-running server processes. - -## Security Implications - -This package assumes that programs run using it are never started with environment -variables that are set by unauthenticated users. Any errors in loading the plugins -will be logged using the standard library logger `log` and ignored. - -This has about the same security implications as [`LD_PRELOAD`][ld-preload] does in most -Linux distributions, but the risk is minimal compared to the massive benefit for -being able to have arbitrary background services all be able to be dug into using -the same tooling or being able to have metric submission be completely separated -from the backend metric creation. Common logging setup processes can be _always_ -loaded, making the default logger settings into the correct settings. - ---- - -[manhole]: https://github.com/Xe/gopreload/tree/master/manhole -[ld-preload]: https://rafalcieslak.wordpress.com/2013/04/02/dynamic-linker-tricks-using-ld_preload-to-cheat-inject-features-and-investigate-programs/ diff --git a/vendor/github.com/Xe/gopreload/doc.go b/vendor/github.com/Xe/gopreload/doc.go deleted file mode 100644 index 720c5c1..0000000 --- a/vendor/github.com/Xe/gopreload/doc.go +++ /dev/null @@ -1,7 +0,0 @@ -/* -Package gopreload is a bit of a hack to emulate the behavior of LD_PRELOAD [ld-preload]. -This allows you to have automatically starting instrumentation, etc. - -[ld-preload]: http://man7.org/linux/man-pages/man8/ld.so.8.html (see LD_PRELOAD section) -*/ -package gopreload diff --git a/vendor/github.com/Xe/gopreload/preload.go b/vendor/github.com/Xe/gopreload/preload.go deleted file mode 100644 index 1b5a0c9..0000000 --- a/vendor/github.com/Xe/gopreload/preload.go +++ /dev/null @@ -1,26 +0,0 @@ -//+build linux,go1.8 - -package gopreload - -import ( - "log" - "os" - "plugin" - "strings" -) - -func init() { - gpv := os.Getenv("GO_PRELOAD") - if gpv == "" { - return - } - - for _, elem := range strings.Split(gpv, ",") { - log.Printf("gopreload: trying to open: %s", elem) - _, err := plugin.Open(elem) - if err != nil { - log.Printf("%v from GO_PRELOAD cannot be loaded: %v", elem, err) - continue - } - } -} diff --git a/vendor/github.com/Xe/jsonfeed/.travis.yml b/vendor/github.com/Xe/jsonfeed/.travis.yml deleted file mode 100644 index e872c60..0000000 --- a/vendor/github.com/Xe/jsonfeed/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/ - -language: go - -go: - - 1.8.1 - -before_install: - - go get -t -v ./... - -script: - - go test -race -coverprofile=coverage.txt -covermode=atomic - -after_success: - - bash <(curl -s https://codecov.io/bash) diff --git a/vendor/github.com/Xe/jsonfeed/LICENSE b/vendor/github.com/Xe/jsonfeed/LICENSE deleted file mode 100644 index e87a115..0000000 --- a/vendor/github.com/Xe/jsonfeed/LICENSE +++ /dev/null @@ -1,363 +0,0 @@ -Mozilla Public License, version 2.0 - -1. Definitions - -1.1. "Contributor" - - means each individual or legal entity that creates, contributes to the - creation of, or owns Covered Software. - -1.2. "Contributor Version" - - means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - - means Source Code Form to which the initial Contributor has attached the - notice in Exhibit A, the Executable Form of such Source Code Form, and - Modifications of such Source Code Form, in each case including portions - thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - a. that the initial Contributor has attached the notice described in - Exhibit B to the Covered Software; or - - b. that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the terms of - a Secondary License. - -1.6. "Executable Form" - - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - - means a work that combines Covered Software with other material, in a - separate file or files, that is not Covered Software. - -1.8. "License" - - means this document. - -1.9. "Licensable" - - means having the right to grant, to the maximum extent possible, whether - at the time of the initial grant or subsequently, any and all of the - rights conveyed by this License. - -1.10. "Modifications" - - means any of the following: - - a. any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered Software; or - - b. any new file in Source Code Form that contains any Covered Software. - -1.11. "Patent Claims" of a Contributor - - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the License, - by the making, using, selling, offering for sale, having made, import, - or transfer of either its Contributions or its Contributor Version. - -1.12. "Secondary License" - - means either the GNU General Public License, Version 2.0, the GNU Lesser - General Public License, Version 2.1, the GNU Affero General Public - License, Version 3.0, or any later versions of those licenses. - -1.13. "Source Code Form" - - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that controls, is - controlled by, or is under common control with You. For purposes of this - definition, "control" means (a) the power, direct or indirect, to cause - the direction or management of such entity, whether by contract or - otherwise, or (b) ownership of more than fifty percent (50%) of the - outstanding shares or beneficial ownership of such entity. - - -2. License Grants and Conditions - -2.1. Grants - - Each Contributor hereby grants You a world-wide, royalty-free, - non-exclusive license: - - a. under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - - b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - - The licenses granted in Section 2.1 with respect to any Contribution - become effective for each Contribution on the date the Contributor first - distributes such Contribution. - -2.3. Limitations on Grant Scope - - The licenses granted in this Section 2 are the only rights granted under - this License. No additional rights or licenses will be implied from the - distribution or licensing of Covered Software under this License. - Notwithstanding Section 2.1(b) above, no patent license is granted by a - Contributor: - - a. for any code that a Contributor has removed from Covered Software; or - - b. for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - - c. under Patent Claims infringed by Covered Software in the absence of - its Contributions. - - This License does not grant any rights in the trademarks, service marks, - or logos of any Contributor (except as may be necessary to comply with - the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - - No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this - License (see Section 10.2) or under the terms of a Secondary License (if - permitted under the terms of Section 3.3). - -2.5. Representation - - Each Contributor represents that the Contributor believes its - Contributions are its original creation(s) or it has sufficient rights to - grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - - This License is not intended to limit any rights You have under - applicable copyright doctrines of fair use, fair dealing, or other - equivalents. - -2.7. Conditions - - Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in - Section 2.1. - - -3. Responsibilities - -3.1. Distribution of Source Form - - All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under - the terms of this License. You must inform recipients that the Source - Code Form of the Covered Software is governed by the terms of this - License, and how they can obtain a copy of this License. You may not - attempt to alter or restrict the recipients' rights in the Source Code - Form. - -3.2. Distribution of Executable Form - - If You distribute Covered Software in Executable Form then: - - a. such Covered Software must also be made available in Source Code Form, - as described in Section 3.1, and You must inform recipients of the - Executable Form how they can obtain a copy of such Source Code Form by - reasonable means in a timely manner, at a charge no more than the cost - of distribution to the recipient; and - - b. You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter the - recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - - You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for - the Covered Software. If the Larger Work is a combination of Covered - Software with a work governed by one or more Secondary Licenses, and the - Covered Software is not Incompatible With Secondary Licenses, this - License permits You to additionally distribute such Covered Software - under the terms of such Secondary License(s), so that the recipient of - the Larger Work may, at their option, further distribute the Covered - Software under the terms of either this License or such Secondary - License(s). - -3.4. Notices - - You may not remove or alter the substance of any license notices - (including copyright notices, patent notices, disclaimers of warranty, or - limitations of liability) contained within the Source Code Form of the - Covered Software, except that You may alter any license notices to the - extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - - You may choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on - behalf of any Contributor. You must make it absolutely clear that any - such warranty, support, indemnity, or liability obligation is offered by - You alone, and You hereby agree to indemnify every Contributor for any - liability incurred by such Contributor as a result of warranty, support, - indemnity or liability terms You offer. You may include additional - disclaimers of warranty and limitations of liability specific to any - jurisdiction. - -4. Inability to Comply Due to Statute or Regulation - - If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, - judicial order, or regulation then You must: (a) comply with the terms of - this License to the maximum extent possible; and (b) describe the - limitations and the code they affect. Such description must be placed in a - text file included with all distributions of the Covered Software under - this License. Except to the extent prohibited by statute or regulation, - such description must be sufficiently detailed for a recipient of ordinary - skill to be able to understand it. - -5. Termination - -5.1. The rights granted under this License will terminate automatically if You - fail to comply with any of its terms. However, if You become compliant, - then the rights granted under this License from a particular Contributor - are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing - basis, if such Contributor fails to notify You of the non-compliance by - some reasonable means prior to 60 days after You have come back into - compliance. Moreover, Your grants from a particular Contributor are - reinstated on an ongoing basis if such Contributor notifies You of the - non-compliance by some reasonable means, this is the first time You have - received notice of non-compliance with this License from such - Contributor, and You become compliant prior to 30 days after Your receipt - of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, - counter-claims, and cross-claims) alleging that a Contributor Version - directly or indirectly infringes any patent, then the rights granted to - You by any and all Contributors for the Covered Software under Section - 2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user - license agreements (excluding distributors and resellers) which have been - validly granted by You or Your distributors under this License prior to - termination shall survive termination. - -6. Disclaimer of Warranty - - Covered Software is provided under this License on an "as is" basis, - without warranty of any kind, either expressed, implied, or statutory, - including, without limitation, warranties that the Covered Software is free - of defects, merchantable, fit for a particular purpose or non-infringing. - The entire risk as to the quality and performance of the Covered Software - is with You. Should any Covered Software prove defective in any respect, - You (not any Contributor) assume the cost of any necessary servicing, - repair, or correction. This disclaimer of warranty constitutes an essential - part of this License. No use of any Covered Software is authorized under - this License except under this disclaimer. - -7. Limitation of Liability - - Under no circumstances and under no legal theory, whether tort (including - negligence), contract, or otherwise, shall any Contributor, or anyone who - distributes Covered Software as permitted above, be liable to You for any - direct, indirect, special, incidental, or consequential damages of any - character including, without limitation, damages for lost profits, loss of - goodwill, work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses, even if such party shall have been - informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from - such party's negligence to the extent applicable law prohibits such - limitation. Some jurisdictions do not allow the exclusion or limitation of - incidental or consequential damages, so this exclusion and limitation may - not apply to You. - -8. Litigation - - Any litigation relating to this License may be brought only in the courts - of a jurisdiction where the defendant maintains its principal place of - business and such litigation shall be governed by laws of that - jurisdiction, without reference to its conflict-of-law provisions. Nothing - in this Section shall prevent a party's ability to bring cross-claims or - counter-claims. - -9. Miscellaneous - - This License represents the complete agreement concerning the subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. Any law or regulation which provides that - the language of a contract shall be construed against the drafter shall not - be used to construe this License against a Contributor. - - -10. Versions of the License - -10.1. New Versions - - Mozilla Foundation is the license steward. Except as provided in Section - 10.3, no one other than the license steward has the right to modify or - publish new versions of this License. Each version will be given a - distinguishing version number. - -10.2. Effect of New Versions - - You may distribute the Covered Software under the terms of the version - of the License under which You originally received the Covered Software, - or under the terms of any subsequent version published by the license - steward. - -10.3. Modified Versions - - If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a - modified version of this License if you rename the license and remove - any references to the name of the license steward (except to note that - such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary - Licenses If You choose to distribute Source Code Form that is - Incompatible With Secondary Licenses under the terms of this version of - the License, the notice described in Exhibit B of this License must be - attached. - -Exhibit A - Source Code Form License Notice - - This Source Code Form is subject to the - terms of the Mozilla Public License, v. - 2.0. If a copy of the MPL was not - distributed with this file, You can - obtain one at - http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular file, -then You may include the notice in a location (such as a LICENSE file in a -relevant directory) where a recipient would be likely to look for such a -notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice - - This Source Code Form is "Incompatible - With Secondary Licenses", as defined by - the Mozilla Public License, v. 2.0. - diff --git a/vendor/github.com/Xe/jsonfeed/README.md b/vendor/github.com/Xe/jsonfeed/README.md deleted file mode 100644 index 27f7cb5..0000000 --- a/vendor/github.com/Xe/jsonfeed/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# JSONFeed - Go Package to parse JSON Feed streams - -[![Build Status](https://travis-ci.org/st3fan/jsonfeed.svg?branch=master)](https://travis-ci.org/st3fan/jsonfeed) [![Go Report Card](https://goreportcard.com/badge/github.com/st3fan/jsonfeed)](https://goreportcard.com/report/github.com/st3fan/jsonfeed) [![codecov](https://codecov.io/gh/st3fan/jsonfeed/branch/master/graph/badge.svg)](https://codecov.io/gh/st3fan/jsonfeed) - - -*Stefan Arentz, May 2017* - -Work in progress. Minimal package to parse JSON Feed streams. Please file feature requests. diff --git a/vendor/github.com/Xe/jsonfeed/jsonfeed.go b/vendor/github.com/Xe/jsonfeed/jsonfeed.go deleted file mode 100644 index 913880d..0000000 --- a/vendor/github.com/Xe/jsonfeed/jsonfeed.go +++ /dev/null @@ -1,73 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at http://mozilla.org/MPL/2.0/ - -package jsonfeed - -import ( - "encoding/json" - "io" - "time" -) - -const CurrentVersion = "https://jsonfeed.org/version/1" - -type Item struct { - ID string `json:"id"` - URL string `json:"url"` - ExternalURL string `json:"external_url"` - Title string `json:"title"` - ContentHTML string `json:"content_html"` - ContentText string `json:"content_text"` - Summary string `json:"summary"` - Image string `json:"image"` - BannerImage string `json:"banner_image"` - DatePublished time.Time `json:"date_published"` - DateModified time.Time `json:"date_modified"` - Author Author `json:"author"` - Tags []string `json:"tags"` -} - -type Author struct { - Name string `json:"name"` - URL string `json:"url"` - Avatar string `json:"avatar"` -} - -type Hub struct { - Type string `json:"type"` - URL string `json:"url"` -} - -type Attachment struct { - URL string `json:"url"` - MIMEType string `json:"mime_type"` - Title string `json:"title"` - SizeInBytes int64 `json:"size_in_bytes"` - DurationInSeconds int64 `json:"duration_in_seconds"` -} - -type Feed struct { - Version string `json:"version"` - Title string `json:"title"` - HomePageURL string `json:"home_page_url"` - FeedURL string `json:"feed_url"` - Description string `json:"description"` - UserComment string `json:"user_comment"` - NextURL string `json:"next_url"` - Icon string `json:"icon"` - Favicon string `json:"favicon"` - Author Author `json:"author"` - Expired bool `json:"expired"` - Hubs []Hub `json:"hubs"` - Items []Item `json:"items"` -} - -func Parse(r io.Reader) (Feed, error) { - var feed Feed - decoder := json.NewDecoder(r) - if err := decoder.Decode(&feed); err != nil { - return Feed{}, err - } - return feed, nil -} diff --git a/vendor/github.com/Xe/ln/LICENSE b/vendor/github.com/Xe/ln/LICENSE deleted file mode 100644 index 7202b64..0000000 --- a/vendor/github.com/Xe/ln/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2015, Andrew Gwozdziewycz -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/vendor/github.com/Xe/ln/README.md b/vendor/github.com/Xe/ln/README.md deleted file mode 100644 index 61fc941..0000000 --- a/vendor/github.com/Xe/ln/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# ln: The Natural Logger for Go - -`ln` provides a simple interface to logging, and metrics, and -obviates the need to utilize purpose built metrics packages, like -`go-metrics` for simple use cases. - -The design of `ln` centers around the idea of key-value pairs, which -can be interpreted on the fly, but "Filters" to do things such as -aggregated metrics, and report said metrics to, say Librato, or -statsd. - -"Filters" are like WSGI, or Rack Middleware. They are run "top down" -and can abort an emitted log's output at any time, or continue to let -it through the chain. However, the interface is slightly different -than that. Rather than encapsulating the chain with partial function -application, we utilize a simpler method, namely, each plugin defines -an `Apply` function, which takes as an argument the log event, and -performs the work of the plugin, only if the Plugin "Applies" to this -log event. - -If `Apply` returns `false`, the iteration through the rest of the -filters is aborted, and the log is dropped from further processing. - -## Current Status: Initial Development / Concept - -## Copyright - -(c) 2015, Andrew Gwozdziewycz, BSD Licensed. See LICENSE for more -info. diff --git a/vendor/github.com/Xe/ln/action.go b/vendor/github.com/Xe/ln/action.go deleted file mode 100644 index 54f8954..0000000 --- a/vendor/github.com/Xe/ln/action.go +++ /dev/null @@ -1,11 +0,0 @@ -package ln - -// Action is a convenience helper for logging the "action" being performed as -// part of a log line. -// -// It is a convenience wrapper for the following: -// -// ln.Log(ctx, fer, f, ln.Action("writing frozberry sales reports to database")) -func Action(act string) Fer { - return F{"action": act} -} diff --git a/vendor/github.com/Xe/ln/context.go b/vendor/github.com/Xe/ln/context.go deleted file mode 100644 index 0ea3229..0000000 --- a/vendor/github.com/Xe/ln/context.go +++ /dev/null @@ -1,38 +0,0 @@ -package ln - -import ( - "context" -) - -type ctxKey int - -const ( - fKey = iota -) - -// WithF stores or appends a given F instance into a context. -func WithF(ctx context.Context, f F) context.Context { - pf, ok := FFromContext(ctx) - if !ok { - return context.WithValue(ctx, fKey, f) - } - - pf.Extend(f) - - return context.WithValue(ctx, fKey, pf) -} - -// FFromContext fetches the `F` out of the context if it exists. -func FFromContext(ctx context.Context) (F, bool) { - fvp := ctx.Value(fKey) - if fvp == nil { - return nil, false - } - - f, ok := fvp.(F) - if !ok { - return nil, false - } - - return f, true -} diff --git a/vendor/github.com/Xe/ln/doc.go b/vendor/github.com/Xe/ln/doc.go deleted file mode 100644 index ab81c3c..0000000 --- a/vendor/github.com/Xe/ln/doc.go +++ /dev/null @@ -1,25 +0,0 @@ -/* -Package ln is the Natural Logger for Go - -`ln` provides a simple interface to logging, and metrics, and -obviates the need to utilize purpose built metrics packages, like -`go-metrics` for simple use cases. - -The design of `ln` centers around the idea of key-value pairs, which -can be interpreted on the fly, but "Filters" to do things such as -aggregated metrics, and report said metrics to, say Librato, or -statsd. - -"Filters" are like WSGI, or Rack Middleware. They are run "top down" -and can abort an emitted log's output at any time, or continue to let -it through the chain. However, the interface is slightly different -than that. Rather than encapsulating the chain with partial function -application, we utilize a simpler method, namely, each plugin defines -an `Apply` function, which takes as an argument the log event, and -performs the work of the plugin, only if the Plugin "Applies" to this -log event. - -If `Apply` returns `false`, the iteration through the rest of the -filters is aborted, and the log is dropped from further processing. -*/ -package ln diff --git a/vendor/github.com/Xe/ln/filter.go b/vendor/github.com/Xe/ln/filter.go deleted file mode 100644 index 4f2d006..0000000 --- a/vendor/github.com/Xe/ln/filter.go +++ /dev/null @@ -1,67 +0,0 @@ -package ln - -import ( - "context" - "io" - "sync" -) - -// Filter interface for defining chain filters -type Filter interface { - Apply(ctx context.Context, e Event) bool - Run() - Close() -} - -// FilterFunc allows simple functions to implement the Filter interface -type FilterFunc func(ctx context.Context, e Event) bool - -// Apply implements the Filter interface -func (ff FilterFunc) Apply(ctx context.Context, e Event) bool { - return ff(ctx, e) -} - -// Run implements the Filter interface -func (ff FilterFunc) Run() {} - -// Close implements the Filter interface -func (ff FilterFunc) Close() {} - -// WriterFilter implements a filter, which arbitrarily writes to an io.Writer -type WriterFilter struct { - sync.Mutex - Out io.Writer - Formatter Formatter -} - -// NewWriterFilter creates a filter to add to the chain -func NewWriterFilter(out io.Writer, format Formatter) *WriterFilter { - if format == nil { - format = DefaultFormatter - } - return &WriterFilter{ - Out: out, - Formatter: format, - } -} - -// Apply implements the Filter interface -func (w *WriterFilter) Apply(ctx context.Context, e Event) bool { - output, err := w.Formatter.Format(ctx, e) - if err == nil { - w.Lock() - w.Out.Write(output) - w.Unlock() - } - - return true -} - -// Run implements the Filter interface -func (w *WriterFilter) Run() {} - -// Close implements the Filter interface -func (w *WriterFilter) Close() {} - -// NilFilter is safe to return as a Filter, but does nothing -var NilFilter = FilterFunc(func(_ context.Context, e Event) bool { return true }) diff --git a/vendor/github.com/Xe/ln/formatter.go b/vendor/github.com/Xe/ln/formatter.go deleted file mode 100644 index 70313fc..0000000 --- a/vendor/github.com/Xe/ln/formatter.go +++ /dev/null @@ -1,111 +0,0 @@ -package ln - -import ( - "bytes" - "context" - "fmt" - "time" -) - -var ( - // DefaultTimeFormat represents the way in which time will be formatted by default - DefaultTimeFormat = time.RFC3339 -) - -// Formatter defines the formatting of events -type Formatter interface { - Format(ctx context.Context, e Event) ([]byte, error) -} - -// DefaultFormatter is the default way in which to format events -var DefaultFormatter Formatter - -func init() { - DefaultFormatter = NewTextFormatter() -} - -// TextFormatter formats events as key value pairs. -// Any remaining text not wrapped in an instance of `F` will be -// placed at the end. -type TextFormatter struct { - TimeFormat string -} - -// NewTextFormatter returns a Formatter that outputs as text. -func NewTextFormatter() Formatter { - return &TextFormatter{TimeFormat: DefaultTimeFormat} -} - -// Format implements the Formatter interface -func (t *TextFormatter) Format(_ context.Context, e Event) ([]byte, error) { - var writer bytes.Buffer - - writer.WriteString("time=\"") - writer.WriteString(e.Time.Format(t.TimeFormat)) - writer.WriteString("\"") - - keys := make([]string, len(e.Data)) - i := 0 - - for k := range e.Data { - keys[i] = k - i++ - } - - for _, k := range keys { - v := e.Data[k] - - writer.WriteByte(' ') - if shouldQuote(k) { - writer.WriteString(fmt.Sprintf("%q", k)) - } else { - writer.WriteString(k) - } - - writer.WriteByte('=') - - switch v.(type) { - case string: - vs, _ := v.(string) - if shouldQuote(vs) { - fmt.Fprintf(&writer, "%q", vs) - } else { - writer.WriteString(vs) - } - case error: - tmperr, _ := v.(error) - es := tmperr.Error() - - if shouldQuote(es) { - fmt.Fprintf(&writer, "%q", es) - } else { - writer.WriteString(es) - } - case time.Time: - tmptime, _ := v.(time.Time) - writer.WriteString(tmptime.Format(time.RFC3339)) - default: - fmt.Fprint(&writer, v) - } - } - - if len(e.Message) > 0 { - fmt.Fprintf(&writer, " _msg=%q", e.Message) - } - - writer.WriteByte('\n') - return writer.Bytes(), nil -} - -func shouldQuote(s string) bool { - for _, b := range s { - if !((b >= 'A' && b <= 'Z') || - (b >= 'a' && b <= 'z') || - (b >= '0' && b <= '9') || - (b == '-' || b == '.' || b == '#' || - b == '/' || b == '_')) { - return true - } - } - return false -} diff --git a/vendor/github.com/Xe/ln/logger.go b/vendor/github.com/Xe/ln/logger.go deleted file mode 100644 index 79a9a63..0000000 --- a/vendor/github.com/Xe/ln/logger.go +++ /dev/null @@ -1,180 +0,0 @@ -package ln - -import ( - "context" - "os" - "time" - - "github.com/pkg/errors" -) - -// Logger holds the current priority and list of filters -type Logger struct { - Filters []Filter -} - -// DefaultLogger is the default implementation of Logger -var DefaultLogger *Logger - -func init() { - var defaultFilters []Filter - - // Default to STDOUT for logging, but allow LN_OUT to change it. - out := os.Stdout - if os.Getenv("LN_OUT") == "" { - out = os.Stderr - } - - defaultFilters = append(defaultFilters, NewWriterFilter(out, nil)) - - DefaultLogger = &Logger{ - Filters: defaultFilters, - } -} - -// F is a key-value mapping for structured data. -type F map[string]interface{} - -// Extend concatentates one F with one or many Fer instances. -func (f F) Extend(other ...Fer) { - for _, ff := range other { - for k, v := range ff.F() { - f[k] = v - } - } -} - -// F makes F an Fer -func (f F) F() F { - return f -} - -// Fer allows any type to add fields to the structured logging key->value pairs. -type Fer interface { - F() F -} - -// Event represents an event -type Event struct { - Time time.Time - Data F - Message string -} - -// Log is the generic logging method. -func (l *Logger) Log(ctx context.Context, xs ...Fer) { - event := Event{Time: time.Now()} - - addF := func(bf F) { - if event.Data == nil { - event.Data = bf - } else { - for k, v := range bf { - event.Data[k] = v - } - } - } - - for _, f := range xs { - addF(f.F()) - } - - ctxf, ok := FFromContext(ctx) - if ok { - addF(ctxf) - } - - if os.Getenv("LN_DEBUG_ALL_EVENTS") == "1" { - frame := callersFrame() - if event.Data == nil { - event.Data = make(F) - } - event.Data["_lineno"] = frame.lineno - event.Data["_function"] = frame.function - event.Data["_filename"] = frame.filename - } - - l.filter(ctx, event) -} - -func (l *Logger) filter(ctx context.Context, e Event) { - for _, f := range l.Filters { - if !f.Apply(ctx, e) { - return - } - } -} - -// Error logs an error and information about the context of said error. -func (l *Logger) Error(ctx context.Context, err error, xs ...Fer) { - data := F{} - frame := callersFrame() - - data["_lineno"] = frame.lineno - data["_function"] = frame.function - data["_filename"] = frame.filename - data["err"] = err - - cause := errors.Cause(err) - if cause != nil { - data["cause"] = cause.Error() - } - - xs = append(xs, data) - - l.Log(ctx, xs...) -} - -// Fatal logs this set of values, then exits with status code 1. -func (l *Logger) Fatal(ctx context.Context, xs ...Fer) { - xs = append(xs, F{"fatal": true}) - - l.Log(ctx, xs...) - - os.Exit(1) -} - -// FatalErr combines Fatal and Error. -func (l *Logger) FatalErr(ctx context.Context, err error, xs ...Fer) { - xs = append(xs, F{"fatal": true}) - - data := F{} - frame := callersFrame() - - data["_lineno"] = frame.lineno - data["_function"] = frame.function - data["_filename"] = frame.filename - data["err"] = err - - cause := errors.Cause(err) - if cause != nil { - data["cause"] = cause.Error() - } - - xs = append(xs, data) - l.Log(ctx, xs...) - - os.Exit(1) -} - -// Default Implementation - -// Log is the generic logging method. -func Log(ctx context.Context, xs ...Fer) { - DefaultLogger.Log(ctx, xs...) -} - -// Error logs an error and information about the context of said error. -func Error(ctx context.Context, err error, xs ...Fer) { - DefaultLogger.Error(ctx, err, xs...) -} - -// Fatal logs this set of values, then exits with status code 1. -func Fatal(ctx context.Context, xs ...Fer) { - DefaultLogger.Fatal(ctx, xs...) -} - -// FatalErr combines Fatal and Error. -func FatalErr(ctx context.Context, err error, xs ...Fer) { - DefaultLogger.FatalErr(ctx, err, xs...) -} diff --git a/vendor/github.com/Xe/ln/stack.go b/vendor/github.com/Xe/ln/stack.go deleted file mode 100644 index 1cf1e7a..0000000 --- a/vendor/github.com/Xe/ln/stack.go +++ /dev/null @@ -1,44 +0,0 @@ -package ln - -import ( - "os" - "runtime" - "strings" -) - -type frame struct { - filename string - function string - lineno int -} - -// skips 2 frames, since Caller returns the current frame, and we need -// the caller's caller. -func callersFrame() frame { - var out frame - pc, file, line, ok := runtime.Caller(3) - if !ok { - return out - } - srcLoc := strings.LastIndex(file, "/src/") - if srcLoc >= 0 { - file = file[srcLoc+5:] - } - out.filename = file - out.function = functionName(pc) - out.lineno = line - - return out -} - -func functionName(pc uintptr) string { - fn := runtime.FuncForPC(pc) - if fn == nil { - return "???" - } - name := fn.Name() - beg := strings.LastIndex(name, string(os.PathSeparator)) - return name[beg+1:] - // end := strings.LastIndex(name, string(os.PathSeparator)) - // return name[end+1 : len(name)] -} diff --git a/vendor/github.com/google/gops/LICENSE b/vendor/github.com/google/gops/LICENSE deleted file mode 100644 index 55e52a0..0000000 --- a/vendor/github.com/google/gops/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2016 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/google/gops/agent/agent.go b/vendor/github.com/google/gops/agent/agent.go deleted file mode 100644 index 5708391..0000000 --- a/vendor/github.com/google/gops/agent/agent.go +++ /dev/null @@ -1,237 +0,0 @@ -// Copyright 2016 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package agent provides hooks programs can register to retrieve -// diagnostics data by using gops. -package agent - -import ( - "fmt" - "io" - "io/ioutil" - "net" - "os" - gosignal "os/signal" - "runtime" - "runtime/pprof" - "runtime/trace" - "strconv" - "sync" - "time" - - "bufio" - - "github.com/google/gops/internal" - "github.com/google/gops/signal" - "github.com/kardianos/osext" -) - -const defaultAddr = "127.0.0.1:0" - -var ( - mu sync.Mutex - portfile string - listener net.Listener - - units = []string{" bytes", "KB", "MB", "GB", "TB", "PB"} -) - -// Options allows configuring the started agent. -type Options struct { - // Addr is the host:port the agent will be listening at. - // Optional. - Addr string - - // NoShutdownCleanup tells the agent not to automatically cleanup - // resources if the running process receives an interrupt. - // Optional. - NoShutdownCleanup bool -} - -// Listen starts the gops agent on a host process. Once agent started, users -// can use the advanced gops features. The agent will listen to Interrupt -// signals and exit the process, if you need to perform further work on the -// Interrupt signal use the options parameter to configure the agent -// accordingly. -// -// Note: The agent exposes an endpoint via a TCP connection that can be used by -// any program on the system. Review your security requirements before starting -// the agent. -func Listen(opts *Options) error { - mu.Lock() - defer mu.Unlock() - - if opts == nil { - opts = &Options{} - } - if portfile != "" { - return fmt.Errorf("gops: agent already listening at: %v", listener.Addr()) - } - - gopsdir, err := internal.ConfigDir() - if err != nil { - return err - } - err = os.MkdirAll(gopsdir, os.ModePerm) - if err != nil { - return err - } - if !opts.NoShutdownCleanup { - gracefulShutdown() - } - - addr := opts.Addr - if addr == "" { - addr = defaultAddr - } - ln, err := net.Listen("tcp", addr) - if err != nil { - return err - } - listener = ln - port := listener.Addr().(*net.TCPAddr).Port - portfile = fmt.Sprintf("%s/%d", gopsdir, os.Getpid()) - err = ioutil.WriteFile(portfile, []byte(strconv.Itoa(port)), os.ModePerm) - if err != nil { - return err - } - - go listen() - return nil -} - -func listen() { - buf := make([]byte, 1) - for { - fd, err := listener.Accept() - if err != nil { - fmt.Fprintf(os.Stderr, "gops: %v", err) - if netErr, ok := err.(net.Error); ok && !netErr.Temporary() { - break - } - continue - } - if _, err := fd.Read(buf); err != nil { - fmt.Fprintf(os.Stderr, "gops: %v", err) - continue - } - if err := handle(fd, buf); err != nil { - fmt.Fprintf(os.Stderr, "gops: %v", err) - continue - } - fd.Close() - } -} - -func gracefulShutdown() { - c := make(chan os.Signal, 1) - gosignal.Notify(c, os.Interrupt) - go func() { - // cleanup the socket on shutdown. - <-c - Close() - os.Exit(1) - }() -} - -// Close closes the agent, removing temporary files and closing the TCP listener. -// If no agent is listening, Close does nothing. -func Close() { - mu.Lock() - defer mu.Unlock() - - if portfile != "" { - os.Remove(portfile) - portfile = "" - } - if listener != nil { - listener.Close() - } -} - -func formatBytes(val uint64) string { - var i int - var target uint64 - for i = range units { - target = 1 << uint(10*(i+1)) - if val < target { - break - } - } - if i > 0 { - return fmt.Sprintf("%0.2f%s (%d bytes)", float64(val)/(float64(target)/1024), units[i], val) - } - return fmt.Sprintf("%d bytes", val) -} - -func handle(conn io.Writer, msg []byte) error { - switch msg[0] { - case signal.StackTrace: - return pprof.Lookup("goroutine").WriteTo(conn, 2) - case signal.GC: - runtime.GC() - _, err := conn.Write([]byte("ok")) - return err - case signal.MemStats: - var s runtime.MemStats - runtime.ReadMemStats(&s) - fmt.Fprintf(conn, "alloc: %v\n", formatBytes(s.Alloc)) - fmt.Fprintf(conn, "total-alloc: %v\n", formatBytes(s.TotalAlloc)) - fmt.Fprintf(conn, "sys: %v\n", formatBytes(s.Sys)) - fmt.Fprintf(conn, "lookups: %v\n", s.Lookups) - fmt.Fprintf(conn, "mallocs: %v\n", s.Mallocs) - fmt.Fprintf(conn, "frees: %v\n", s.Frees) - fmt.Fprintf(conn, "heap-alloc: %v\n", formatBytes(s.HeapAlloc)) - fmt.Fprintf(conn, "heap-sys: %v\n", formatBytes(s.HeapSys)) - fmt.Fprintf(conn, "heap-idle: %v\n", formatBytes(s.HeapIdle)) - fmt.Fprintf(conn, "heap-in-use: %v\n", formatBytes(s.HeapInuse)) - fmt.Fprintf(conn, "heap-released: %v\n", formatBytes(s.HeapReleased)) - fmt.Fprintf(conn, "heap-objects: %v\n", s.HeapObjects) - fmt.Fprintf(conn, "stack-in-use: %v\n", formatBytes(s.StackInuse)) - fmt.Fprintf(conn, "stack-sys: %v\n", formatBytes(s.StackSys)) - fmt.Fprintf(conn, "next-gc: when heap-alloc >= %v\n", formatBytes(s.NextGC)) - lastGC := "-" - if s.LastGC != 0 { - lastGC = fmt.Sprint(time.Unix(0, int64(s.LastGC))) - } - fmt.Fprintf(conn, "last-gc: %v\n", lastGC) - fmt.Fprintf(conn, "gc-pause: %v\n", time.Duration(s.PauseTotalNs)) - fmt.Fprintf(conn, "num-gc: %v\n", s.NumGC) - fmt.Fprintf(conn, "enable-gc: %v\n", s.EnableGC) - fmt.Fprintf(conn, "debug-gc: %v\n", s.DebugGC) - case signal.Version: - fmt.Fprintf(conn, "%v\n", runtime.Version()) - case signal.HeapProfile: - pprof.WriteHeapProfile(conn) - case signal.CPUProfile: - if err := pprof.StartCPUProfile(conn); err != nil { - return err - } - time.Sleep(30 * time.Second) - pprof.StopCPUProfile() - case signal.Stats: - fmt.Fprintf(conn, "goroutines: %v\n", runtime.NumGoroutine()) - fmt.Fprintf(conn, "OS threads: %v\n", pprof.Lookup("threadcreate").Count()) - fmt.Fprintf(conn, "GOMAXPROCS: %v\n", runtime.GOMAXPROCS(0)) - fmt.Fprintf(conn, "num CPU: %v\n", runtime.NumCPU()) - case signal.BinaryDump: - path, err := osext.Executable() - if err != nil { - return err - } - f, err := os.Open(path) - if err != nil { - return err - } - defer f.Close() - - _, err = bufio.NewReader(f).WriteTo(conn) - return err - case signal.Trace: - trace.Start(conn) - time.Sleep(5 * time.Second) - trace.Stop() - } - return nil -} diff --git a/vendor/github.com/google/gops/internal/internal.go b/vendor/github.com/google/gops/internal/internal.go deleted file mode 100644 index 1382822..0000000 --- a/vendor/github.com/google/gops/internal/internal.go +++ /dev/null @@ -1,52 +0,0 @@ -package internal - -import ( - "errors" - "fmt" - "io/ioutil" - "os" - "os/user" - "path/filepath" - "runtime" - "strings" -) - -func ConfigDir() (string, error) { - if runtime.GOOS == "windows" { - return filepath.Join(os.Getenv("APPDATA"), "gops"), nil - } - homeDir := guessUnixHomeDir() - if homeDir == "" { - return "", errors.New("unable to get current user home directory: os/user lookup failed; $HOME is empty") - } - return filepath.Join(homeDir, ".config", "gops"), nil -} - -func guessUnixHomeDir() string { - usr, err := user.Current() - if err == nil { - return usr.HomeDir - } - return os.Getenv("HOME") -} - -func PIDFile(pid int) (string, error) { - gopsdir, err := ConfigDir() - if err != nil { - return "", err - } - return fmt.Sprintf("%s/%d", gopsdir, pid), nil -} - -func GetPort(pid int) (string, error) { - portfile, err := PIDFile(pid) - if err != nil { - return "", err - } - b, err := ioutil.ReadFile(portfile) - if err != nil { - return "", err - } - port := strings.TrimSpace(string(b)) - return port, nil -} diff --git a/vendor/github.com/google/gops/signal/signal.go b/vendor/github.com/google/gops/signal/signal.go deleted file mode 100644 index b2bfbe1..0000000 --- a/vendor/github.com/google/gops/signal/signal.go +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2016 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package signal contains signals used to communicate to the gops agents. -package signal - -const ( - // StackTrace represents a command to print stack trace. - StackTrace = byte(0x1) - - // GC runs the garbage collector. - GC = byte(0x2) - - // MemSt