Skip to content

Commit db9bc51

Browse files
author
Aaron Lehmann
committed
Update vendored go-events
This is needed to suppress a log message about a harmless condition which was previously logged at the WARNING log level with potentially high frequency (docker/go-events#11). Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
1 parent 9a9fc01 commit db9bc51

7 files changed

Lines changed: 132 additions & 4 deletions

File tree

‎hack/vendor.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ clone git github.com/imdario/mergo 0.2.1
6666

6767
#get libnetwork packages
6868
clone git github.com/docker/libnetwork 905d374c096ca1f3a9b75529e52518b7540179f3
69-
clone git github.com/docker/go-events 39718a26497694185f8fb58a7d6f31947f3dc42d
69+
clone git github.com/docker/go-events afb2b9f2c23f33ada1a22b03651775fdc65a5089
7070
clone git github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
7171
clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
7272
clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b

‎vendor/src/github.com/docker/go-events/CONTRIBUTING.md‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Contributing to Docker open source projects
2+
3+
Want to hack on go-events? Awesome! Here are instructions to get you started.
4+
5+
go-events is part of the [Docker](https://www.docker.com) project, and
6+
follows the same rules and principles. If you're already familiar with the way
7+
Docker does things, you'll feel right at home.
8+
9+
Otherwise, go read Docker's
10+
[contributions guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md),
11+
[issue triaging](https://github.com/docker/docker/blob/master/project/ISSUE-TRIAGE.md),
12+
[review process](https://github.com/docker/docker/blob/master/project/REVIEWING.md) and
13+
[branches and tags](https://github.com/docker/docker/blob/master/project/BRANCHES-AND-TAGS.md).
14+
15+
For an in-depth description of our contribution process, visit the
16+
contributors guide: [Understand how to contribute](https://docs.docker.com/opensource/workflow/make-a-contribution/)
17+
18+
### Sign your work
19+
20+
The sign-off is a simple line at the end of the explanation for the patch. Your
21+
signature certifies that you wrote the patch or otherwise have the right to pass
22+
it on as an open-source patch. The rules are pretty simple: if you can certify
23+
the below (from [developercertificate.org](http://developercertificate.org/)):
24+
25+
```
26+
Developer Certificate of Origin
27+
Version 1.1
28+
29+
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
30+
660 York Street, Suite 102,
31+
San Francisco, CA 94110 USA
32+
33+
Everyone is permitted to copy and distribute verbatim copies of this
34+
license document, but changing it is not allowed.
35+
36+
Developer's Certificate of Origin 1.1
37+
38+
By making a contribution to this project, I certify that:
39+
40+
(a) The contribution was created in whole or in part by me and I
41+
have the right to submit it under the open source license
42+
indicated in the file; or
43+
44+
(b) The contribution is based upon previous work that, to the best
45+
of my knowledge, is covered under an appropriate open source
46+
license and I have the right under that license to submit that
47+
work with modifications, whether created in whole or in part
48+
by me, under the same open source license (unless I am
49+
permitted to submit under a different license), as indicated
50+
in the file; or
51+
52+
(c) The contribution was provided directly to me by some other
53+
person who certified (a), (b) or (c) and I have not modified
54+
it.
55+
56+
(d) I understand and agree that this project and the contribution
57+
are public and that a record of the contribution (including all
58+
personal information I submit with it, including my sign-off) is
59+
maintained indefinitely and may be redistributed consistent with
60+
this project or the open source license(s) involved.
61+
```
62+
63+
Then you just add a line to every git commit message:
64+
65+
Signed-off-by: Joe Smith <joe.smith@email.com>
66+
67+
Use your real name (sorry, no pseudonyms or anonymous contributions.)
68+
69+
If you set your `user.name` and `user.email` git configs, you can sign your
70+
commit automatically with `git commit -s`.

‎vendor/src/github.com/docker/go-events/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright {yyyy} {name of copyright owner}
189+
Copyright 2016 Docker, Inc.
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎vendor/src/github.com/docker/go-events/MAINTAINERS‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# go-events maintainers file
2+
#
3+
# This file describes who runs the docker/go-events project and how.
4+
# This is a living document - if you see something out of date or missing, speak up!
5+
#
6+
# It is structured to be consumable by both humans and programs.
7+
# To extract its contents programmatically, use any TOML-compliant parser.
8+
#
9+
# This file is compiled into the MAINTAINERS file in docker/opensource.
10+
#
11+
[Org]
12+
[Org."Core maintainers"]
13+
people = [
14+
"aaronlehmann",
15+
"aluzzardi",
16+
"lk4d4",
17+
"stevvooe",
18+
]
19+
20+
[people]
21+
22+
# A reference list of all people associated with the project.
23+
# All other sections should refer to people by their canonical key
24+
# in the people section.
25+
26+
# ADD YOURSELF HERE IN ALPHABETICAL ORDER
27+
28+
[people.aaronlehmann]
29+
Name = "Aaron Lehmann"
30+
Email = "aaron.lehmann@docker.com"
31+
GitHub = "aaronlehmann"
32+
33+
[people.aluzzardi]
34+
Name = "Andrea Luzzardi"
35+
Email = "al@docker.com"
36+
GitHub = "aluzzardi"
37+
38+
[people.lk4d4]
39+
Name = "Alexander Morozov"
40+
Email = "lk4d4@docker.com"
41+
GitHub = "lk4d4"
42+
43+
[people.stevvooe]
44+
Name = "Stephen Day"
45+
Email = "stephen.day@docker.com"
46+
GitHub = "stevvooe"

‎vendor/src/github.com/docker/go-events/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,8 @@ Application behavior can be controlled by how `Write` behaves. The examples
110110
above are designed to queue the message and return as quickly as possible.
111111
Other implementations may block until the event is committed to durable
112112
storage.
113+
114+
## Copyright and license
115+
116+
Copyright © 2016 Docker, Inc. go-events is licensed under the Apache License,
117+
Version 2.0. See [LICENSE](LICENSE) for the full license text.

‎vendor/src/github.com/docker/go-events/channel.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type Channel struct {
1010
closed chan struct{}
1111
}
1212

13-
// NewChannel returns a channel. If buffer is non-zero, the channel is
13+
// NewChannel returns a channel. If buffer is zero, the channel is
1414
// unbuffered.
1515
func NewChannel(buffer int) *Channel {
1616
return &Channel{

‎vendor/src/github.com/docker/go-events/queue.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,17 @@ func (eq *Queue) run() {
7272
}
7373

7474
if err := eq.dst.Write(event); err != nil {
75+
// TODO(aaronl): Dropping events could be bad depending
76+
// on the application. We should have a way of
77+
// communicating this condition. However, logging
78+
// at a log level above debug may not be appropriate.
79+
// Eventually, go-events should not use logrus at all,
80+
// and should bubble up conditions like this through
81+
// error values.
7582
logrus.WithFields(logrus.Fields{
7683
"event": event,
7784
"sink": eq.dst,
78-
}).WithError(err).Warnf("eventqueue: dropped event")
85+
}).WithError(err).Debug("eventqueue: dropped event")
7986
}
8087
}
8188
}

0 commit comments

Comments
 (0)