mirror of
https://github.com/DNSCrypt/dnscrypt-proxy.git
synced 2025-04-04 21:57:44 +03:00
Add systemd readiness notification
This commit is contained in:
Frank Denis
parent
eeb57172d1
commit
0fcbbfda1f
14 changed files with 825 additions and 1 deletions
8
Gopkg.lock
generated
8
Gopkg.lock
generated
|
|
@ -31,6 +31,12 @@
|
||||||
packages = ["."]
|
packages = ["."]
|
||||||
revision = "6cf43fdfd7a228cf3003ae23d10ddbf65e85997b"
|
revision = "6cf43fdfd7a228cf3003ae23d10ddbf65e85997b"
|
||||||
|
|
||||||
|
[[projects]]
|
||||||
|
name = "github.com/coreos/go-systemd"
|
||||||
|
packages = ["daemon"]
|
||||||
|
revision = "d2196463941895ee908e13531a23a39feb9e1243"
|
||||||
|
version = "v15"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "master"
|
branch = "master"
|
||||||
name = "github.com/dchest/safefile"
|
name = "github.com/dchest/safefile"
|
||||||
|
|
@ -135,6 +141,6 @@
|
||||||
[solve-meta]
|
[solve-meta]
|
||||||
analyzer-name = "dep"
|
analyzer-name = "dep"
|
||||||
analyzer-version = 1
|
analyzer-version = 1
|
||||||
inputs-digest = "37c01e4336c75cb683760092743ea0e2419b43ad0775db39a46795d8a7a865aa"
|
inputs-digest = "bd47db362365a135ccf6bee5bcfcc4732b9e1aa6911e01c76de008dc3faf3844"
|
||||||
solver-name = "gps-cdcl"
|
solver-name = "gps-cdcl"
|
||||||
solver-version = 1
|
solver-version = 1
|
||||||
|
|
|
||||||
|
|
@ -49,3 +49,7 @@
|
||||||
[[constraint]]
|
[[constraint]]
|
||||||
branch = "master"
|
branch = "master"
|
||||||
name = "github.com/kardianos/service"
|
name = "github.com/kardianos/service"
|
||||||
|
|
||||||
|
[[constraint]]
|
||||||
|
name = "github.com/coreos/go-systemd"
|
||||||
|
version = "15.0.0"
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/go-systemd/daemon"
|
||||||
"github.com/jedisct1/dlog"
|
"github.com/jedisct1/dlog"
|
||||||
"github.com/kardianos/service"
|
"github.com/kardianos/service"
|
||||||
"golang.org/x/crypto/curve25519"
|
"golang.org/x/crypto/curve25519"
|
||||||
|
|
@ -156,6 +157,7 @@ func (proxy *Proxy) StartProxy() {
|
||||||
liveServers, err := proxy.serversInfo.refresh(proxy)
|
liveServers, err := proxy.serversInfo.refresh(proxy)
|
||||||
if liveServers > 0 {
|
if liveServers > 0 {
|
||||||
dlog.Noticef("dnscrypt-proxy %s is ready - live servers: %d", AppVersion, liveServers)
|
dlog.Noticef("dnscrypt-proxy %s is ready - live servers: %d", AppVersion, liveServers)
|
||||||
|
daemon.SdNotify(false, "READY=1")
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
dlog.Error(err)
|
dlog.Error(err)
|
||||||
dlog.Notice("dnscrypt-proxy is waiting for at least one server to be reachable")
|
dlog.Notice("dnscrypt-proxy is waiting for at least one server to be reachable")
|
||||||
|
|
|
||||||
29
vendor/github.com/coreos/go-systemd/.travis.yml
generated
vendored
Normal file
29
vendor/github.com/coreos/go-systemd/.travis.yml
generated
vendored
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
language: shell # We do everything inside Docker and don't want travis fiddling with steps or environment variables
|
||||||
|
|
||||||
|
sudo: required
|
||||||
|
|
||||||
|
services:
|
||||||
|
- docker
|
||||||
|
|
||||||
|
env:
|
||||||
|
global:
|
||||||
|
- GOPATH=/opt
|
||||||
|
- BUILD_DIR=/opt/src/github.com/coreos/go-systemd
|
||||||
|
matrix:
|
||||||
|
- DOCKER_BASE=ubuntu:16.04
|
||||||
|
- DOCKER_BASE=debian:stretch
|
||||||
|
|
||||||
|
before_install:
|
||||||
|
- docker pull ${DOCKER_BASE}
|
||||||
|
- docker run --privileged -e GOPATH=${GOPATH} --cidfile=/tmp/cidfile ${DOCKER_BASE} /bin/bash -c "apt-get update && apt-get install -y build-essential git golang dbus libsystemd-dev libpam-systemd systemd-container && go get github.com/coreos/pkg/dlopen && go get github.com/godbus/dbus"
|
||||||
|
- docker commit `cat /tmp/cidfile` go-systemd/container-tests
|
||||||
|
- rm -f /tmp/cidfile
|
||||||
|
|
||||||
|
install:
|
||||||
|
- docker run -d --cidfile=/tmp/cidfile --privileged -e GOPATH=${GOPATH} -v ${PWD}:${BUILD_DIR} go-systemd/container-tests /bin/systemd --system
|
||||||
|
|
||||||
|
script:
|
||||||
|
- docker exec `cat /tmp/cidfile` /bin/bash -c "cd ${BUILD_DIR} && ./test"
|
||||||
|
|
||||||
|
after_script:
|
||||||
|
- docker kill `cat /tmp/cidfile`
|
||||||
77
vendor/github.com/coreos/go-systemd/CONTRIBUTING.md
generated
vendored
Normal file
77
vendor/github.com/coreos/go-systemd/CONTRIBUTING.md
generated
vendored
Normal file
|
|
@ -0,0 +1,77 @@
|
||||||
|
# How to Contribute
|
||||||
|
|
||||||
|
CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via
|
||||||
|
GitHub pull requests. This document outlines some of the conventions on
|
||||||
|
development workflow, commit message formatting, contact points and other
|
||||||
|
resources to make it easier to get your contribution accepted.
|
||||||
|
|
||||||
|
# Certificate of Origin
|
||||||
|
|
||||||
|
By contributing to this project you agree to the Developer Certificate of
|
||||||
|
Origin (DCO). This document was created by the Linux Kernel community and is a
|
||||||
|
simple statement that you, as a contributor, have the legal right to make the
|
||||||
|
contribution. See the [DCO](DCO) file for details.
|
||||||
|
|
||||||
|
# Email and Chat
|
||||||
|
|
||||||
|
The project currently uses the general CoreOS email list and IRC channel:
|
||||||
|
- Email: [coreos-dev](https://groups.google.com/forum/#!forum/coreos-dev)
|
||||||
|
- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org
|
||||||
|
|
||||||
|
Please avoid emailing maintainers found in the MAINTAINERS file directly. They
|
||||||
|
are very busy and read the mailing lists.
|
||||||
|
|
||||||
|
## Getting Started
|
||||||
|
|
||||||
|
- Fork the repository on GitHub
|
||||||
|
- Read the [README](README.md) for build and test instructions
|
||||||
|
- Play with the project, submit bugs, submit patches!
|
||||||
|
|
||||||
|
## Contribution Flow
|
||||||
|
|
||||||
|
This is a rough outline of what a contributor's workflow looks like:
|
||||||
|
|
||||||
|
- Create a topic branch from where you want to base your work (usually master).
|
||||||
|
- Make commits of logical units.
|
||||||
|
- Make sure your commit messages are in the proper format (see below).
|
||||||
|
- Push your changes to a topic branch in your fork of the repository.
|
||||||
|
- Make sure the tests pass, and add any new tests as appropriate.
|
||||||
|
- Submit a pull request to the original repository.
|
||||||
|
|
||||||
|
Thanks for your contributions!
|
||||||
|
|
||||||
|
### Coding Style
|
||||||
|
|
||||||
|
CoreOS projects written in Go follow a set of style guidelines that we've documented
|
||||||
|
[here](https://github.com/coreos/docs/tree/master/golang). Please follow them when
|
||||||
|
working on your contributions.
|
||||||
|
|
||||||
|
### Format of the Commit Message
|
||||||
|
|
||||||
|
We follow a rough convention for commit messages that is designed to answer two
|
||||||
|
questions: what changed and why. The subject line should feature the what and
|
||||||
|
the body of the commit should describe the why.
|
||||||
|
|
||||||
|
```
|
||||||
|
scripts: add the test-cluster command
|
||||||
|
|
||||||
|
this uses tmux to setup a test cluster that you can easily kill and
|
||||||
|
start for debugging.
|
||||||
|
|
||||||
|
Fixes #38
|
||||||
|
```
|
||||||
|
|
||||||
|
The format can be described more formally as follows:
|
||||||
|
|
||||||
|
```
|
||||||
|
<subsystem>: <what changed>
|
||||||
|
<BLANK LINE>
|
||||||
|
<why this change was made>
|
||||||
|
<BLANK LINE>
|
||||||
|
<footer>
|
||||||
|
```
|
||||||
|
|
||||||
|
The first line is the subject and should be no longer than 70 characters, the
|
||||||
|
second line is always blank, and other lines should be wrapped at 80 characters.
|
||||||
|
This allows the message to be easier to read on GitHub as well as in various
|
||||||
|
git tools.
|
||||||
36
vendor/github.com/coreos/go-systemd/DCO
generated
vendored
Normal file
36
vendor/github.com/coreos/go-systemd/DCO
generated
vendored
Normal file
|
|
@ -0,0 +1,36 @@
|
||||||
|
Developer Certificate of Origin
|
||||||
|
Version 1.1
|
||||||
|
|
||||||
|
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
|
||||||
|
660 York Street, Suite 102,
|
||||||
|
San Francisco, CA 94110 USA
|
||||||
|
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies of this
|
||||||
|
license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
|
||||||
|
Developer's Certificate of Origin 1.1
|
||||||
|
|
||||||
|
By making a contribution to this project, I certify that:
|
||||||
|
|
||||||
|
(a) The contribution was created in whole or in part by me and I
|
||||||
|
have the right to submit it under the open source license
|
||||||
|
indicated in the file; or
|
||||||
|
|
||||||
|
(b) The contribution is based upon previous work that, to the best
|
||||||
|
of my knowledge, is covered under an appropriate open source
|
||||||
|
license and I have the right under that license to submit that
|
||||||
|
work with modifications, whether created in whole or in part
|
||||||
|
by me, under the same open source license (unless I am
|
||||||
|
permitted to submit under a different license), as indicated
|
||||||
|
in the file; or
|
||||||
|
|
||||||
|
(c) The contribution was provided directly to me by some other
|
||||||
|
person who certified (a), (b) or (c) and I have not modified
|
||||||
|
it.
|
||||||
|
|
||||||
|
(d) I understand and agree that this project and the contribution
|
||||||
|
are public and that a record of the contribution (including all
|
||||||
|
personal information I submit with it, including my sign-off) is
|
||||||
|
maintained indefinitely and may be redistributed consistent with
|
||||||
|
this project or the open source license(s) involved.
|
||||||
38
vendor/github.com/coreos/go-systemd/Jenkinsfile
generated
vendored
Normal file
38
vendor/github.com/coreos/go-systemd/Jenkinsfile
generated
vendored
Normal file
|
|
@ -0,0 +1,38 @@
|
||||||
|
matrixJob('Periodic go-systemd builder') {
|
||||||
|
label('master')
|
||||||
|
displayName('Periodic go-systemd builder (master branch)')
|
||||||
|
|
||||||
|
scm {
|
||||||
|
git {
|
||||||
|
remote {
|
||||||
|
url('https://github.com/coreos/go-systemd.git')
|
||||||
|
}
|
||||||
|
branch('master')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
concurrentBuild()
|
||||||
|
|
||||||
|
triggers {
|
||||||
|
cron('@daily')
|
||||||
|
}
|
||||||
|
|
||||||
|
axes {
|
||||||
|
label('os_type', 'debian-testing', 'fedora-24', 'fedora-25')
|
||||||
|
}
|
||||||
|
|
||||||
|
wrappers {
|
||||||
|
buildNameSetter {
|
||||||
|
template('go-systemd master (periodic #${BUILD_NUMBER})')
|
||||||
|
runAtStart(true)
|
||||||
|
runAtEnd(true)
|
||||||
|
}
|
||||||
|
timeout {
|
||||||
|
absolute(25)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
steps {
|
||||||
|
shell('./scripts/jenkins/periodic-go-systemd-builder.sh')
|
||||||
|
}
|
||||||
|
}
|
||||||
191
vendor/github.com/coreos/go-systemd/LICENSE
generated
vendored
Normal file
191
vendor/github.com/coreos/go-systemd/LICENSE
generated
vendored
Normal file
|
|
@ -0,0 +1,191 @@
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction, and
|
||||||
|
distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by the copyright
|
||||||
|
owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all other entities
|
||||||
|
that control, are controlled by, or are under common control with that entity.
|
||||||
|
For the purposes of this definition, "control" means (i) the power, direct or
|
||||||
|
indirect, to cause the direction or management of such entity, whether by
|
||||||
|
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity exercising
|
||||||
|
permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications, including
|
||||||
|
but not limited to software source code, documentation source, and configuration
|
||||||
|
files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical transformation or
|
||||||
|
translation of a Source form, including but not limited to compiled object code,
|
||||||
|
generated documentation, and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or Object form, made
|
||||||
|
available under the License, as indicated by a copyright notice that is included
|
||||||
|
in or attached to the work (an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object form, that
|
||||||
|
is based on (or derived from) the Work and for which the editorial revisions,
|
||||||
|
annotations, elaborations, or other modifications represent, as a whole, an
|
||||||
|
original work of authorship. For the purposes of this License, Derivative Works
|
||||||
|
shall not include works that remain separable from, or merely link (or bind by
|
||||||
|
name) to the interfaces of, the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including the original version
|
||||||
|
of the Work and any modifications or additions to that Work or Derivative Works
|
||||||
|
thereof, that is intentionally submitted to Licensor for inclusion in the Work
|
||||||
|
by the copyright owner or by an individual or Legal Entity authorized to submit
|
||||||
|
on behalf of the copyright owner. For the purposes of this definition,
|
||||||
|
"submitted" means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems, and
|
||||||
|
issue tracking systems that are managed by, or on behalf of, the Licensor for
|
||||||
|
the purpose of discussing and improving the Work, but excluding communication
|
||||||
|
that is conspicuously marked or otherwise designated in writing by the copyright
|
||||||
|
owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
|
||||||
|
of whom a Contribution has been received by Licensor and subsequently
|
||||||
|
incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License.
|
||||||
|
|
||||||
|
Subject to the terms and conditions of this License, each Contributor hereby
|
||||||
|
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
||||||
|
irrevocable copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the Work and such
|
||||||
|
Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License.
|
||||||
|
|
||||||
|
Subject to the terms and conditions of this License, each Contributor hereby
|
||||||
|
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
||||||
|
irrevocable (except as stated in this section) patent license to make, have
|
||||||
|
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
|
||||||
|
such license applies only to those patent claims licensable by such Contributor
|
||||||
|
that are necessarily infringed by their Contribution(s) alone or by combination
|
||||||
|
of their Contribution(s) with the Work to which such Contribution(s) was
|
||||||
|
submitted. If You institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
|
||||||
|
Contribution incorporated within the Work constitutes direct or contributory
|
||||||
|
patent infringement, then any patent licenses granted to You under this License
|
||||||
|
for that Work shall terminate as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution.
|
||||||
|
|
||||||
|
You may reproduce and distribute copies of the Work or Derivative Works thereof
|
||||||
|
in any medium, with or without modifications, and in Source or Object form,
|
||||||
|
provided that You meet the following conditions:
|
||||||
|
|
||||||
|
You must give any other recipients of the Work or Derivative Works a copy of
|
||||||
|
this License; and
|
||||||
|
You must cause any modified files to carry prominent notices stating that You
|
||||||
|
changed the files; and
|
||||||
|
You must retain, in the Source form of any Derivative Works that You distribute,
|
||||||
|
all copyright, patent, trademark, and attribution notices from the Source form
|
||||||
|
of the Work, excluding those notices that do not pertain to any part of the
|
||||||
|
Derivative Works; and
|
||||||
|
If the Work includes a "NOTICE" text file as part of its distribution, then any
|
||||||
|
Derivative Works that You distribute must include a readable copy of the
|
||||||
|
attribution notices contained within such NOTICE file, excluding those notices
|
||||||
|
that do not pertain to any part of the Derivative Works, in at least one of the
|
||||||
|
following places: within a NOTICE text file distributed as part of the
|
||||||
|
Derivative Works; within the Source form or documentation, if provided along
|
||||||
|
with the Derivative Works; or, within a display generated by the Derivative
|
||||||
|
Works, if and wherever such third-party notices normally appear. The contents of
|
||||||
|
the NOTICE file are for informational purposes only and do not modify the
|
||||||
|
License. You may add Your own attribution notices within Derivative Works that
|
||||||
|
You distribute, alongside or as an addendum to the NOTICE text from the Work,
|
||||||
|
provided that such additional attribution notices cannot be construed as
|
||||||
|
modifying the License.
|
||||||
|
You may add Your own copyright statement to Your modifications and may provide
|
||||||
|
additional or different license terms and conditions for use, reproduction, or
|
||||||
|
distribution of Your modifications, or for any such Derivative Works as a whole,
|
||||||
|
provided Your use, reproduction, and distribution of the Work otherwise complies
|
||||||
|
with the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions.
|
||||||
|
|
||||||
|
Unless You explicitly state otherwise, any Contribution intentionally submitted
|
||||||
|
for inclusion in the Work by You to the Licensor shall be under the terms and
|
||||||
|
conditions of this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify the terms of
|
||||||
|
any separate license agreement you may have executed with Licensor regarding
|
||||||
|
such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks.
|
||||||
|
|
||||||
|
This License does not grant permission to use the trade names, trademarks,
|
||||||
|
service marks, or product names of the Licensor, except as required for
|
||||||
|
reasonable and customary use in describing the origin of the Work and
|
||||||
|
reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, Licensor provides the
|
||||||
|
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
|
||||||
|
including, without limitation, any warranties or conditions of TITLE,
|
||||||
|
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
|
||||||
|
solely responsible for determining the appropriateness of using or
|
||||||
|
redistributing the Work and assume any risks associated with Your exercise of
|
||||||
|
permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability.
|
||||||
|
|
||||||
|
In no event and under no legal theory, whether in tort (including negligence),
|
||||||
|
contract, or otherwise, unless required by applicable law (such as deliberate
|
||||||
|
and grossly negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special, incidental,
|
||||||
|
or consequential damages of any character arising as a result of this License or
|
||||||
|
out of the use or inability to use the Work (including but not limited to
|
||||||
|
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
|
||||||
|
any and all other commercial damages or losses), even if such Contributor has
|
||||||
|
been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability.
|
||||||
|
|
||||||
|
While redistributing the Work or Derivative Works thereof, You may choose to
|
||||||
|
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
|
||||||
|
other liability obligations and/or rights consistent with this License. However,
|
||||||
|
in accepting such obligations, You may act only on Your own behalf and on Your
|
||||||
|
sole responsibility, not on behalf of any other Contributor, and only if You
|
||||||
|
agree to indemnify, defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason of your
|
||||||
|
accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following boilerplate
|
||||||
|
notice, with the fields enclosed by brackets "[]" replaced with your own
|
||||||
|
identifying information. (Don't include the brackets!) The text should be
|
||||||
|
enclosed in the appropriate comment syntax for the file format. We also
|
||||||
|
recommend that a file or class name and description of purpose be included on
|
||||||
|
the same "printed page" as the copyright notice for easier identification within
|
||||||
|
third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
54
vendor/github.com/coreos/go-systemd/README.md
generated
vendored
Normal file
54
vendor/github.com/coreos/go-systemd/README.md
generated
vendored
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
# go-systemd
|
||||||
|
|
||||||
|
[](https://travis-ci.org/coreos/go-systemd)
|
||||||
|
[](http://godoc.org/github.com/coreos/go-systemd)
|
||||||
|
|
||||||
|
Go bindings to systemd. The project has several packages:
|
||||||
|
|
||||||
|
- `activation` - for writing and using socket activation from Go
|
||||||
|
- `dbus` - for starting/stopping/inspecting running services and units
|
||||||
|
- `journal` - for writing to systemd's logging service, journald
|
||||||
|
- `sdjournal` - for reading from journald by wrapping its C API
|
||||||
|
- `machine1` - for registering machines/containers with systemd
|
||||||
|
- `unit` - for (de)serialization and comparison of unit files
|
||||||
|
|
||||||
|
## Socket Activation
|
||||||
|
|
||||||
|
An example HTTP server using socket activation can be quickly set up by following this README on a Linux machine running systemd:
|
||||||
|
|
||||||
|
https://github.com/coreos/go-systemd/tree/master/examples/activation/httpserver
|
||||||
|
|
||||||
|
## Journal
|
||||||
|
|
||||||
|
Using the pure-Go `journal` package you can submit journal entries directly to systemd's journal, taking advantage of features like indexed key/value pairs for each log entry.
|
||||||
|
The `sdjournal` package provides read access to the journal by wrapping around journald's native C API; consequently it requires cgo and the journal headers to be available.
|
||||||
|
|
||||||
|
## D-Bus
|
||||||
|
|
||||||
|
The `dbus` package connects to the [systemd D-Bus API](http://www.freedesktop.org/wiki/Software/systemd/dbus/) and lets you start, stop and introspect systemd units. The API docs are here:
|
||||||
|
|
||||||
|
http://godoc.org/github.com/coreos/go-systemd/dbus
|
||||||
|
|
||||||
|
### Debugging
|
||||||
|
|
||||||
|
Create `/etc/dbus-1/system-local.conf` that looks like this:
|
||||||
|
|
||||||
|
```
|
||||||
|
<!DOCTYPE busconfig PUBLIC
|
||||||
|
"-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
|
||||||
|
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
||||||
|
<busconfig>
|
||||||
|
<policy user="root">
|
||||||
|
<allow eavesdrop="true"/>
|
||||||
|
<allow eavesdrop="true" send_destination="*"/>
|
||||||
|
</policy>
|
||||||
|
</busconfig>
|
||||||
|
```
|
||||||
|
|
||||||
|
## machined
|
||||||
|
|
||||||
|
The `machine1` package allows interaction with the [systemd machined D-Bus API](http://www.freedesktop.org/wiki/Software/systemd/machined/).
|
||||||
|
|
||||||
|
## Units
|
||||||
|
|
||||||
|
The `unit` package provides various functions for working with [systemd unit files](http://www.freedesktop.org/software/systemd/man/systemd.unit.html).
|
||||||
63
vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
generated
vendored
Normal file
63
vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
generated
vendored
Normal file
|
|
@ -0,0 +1,63 @@
|
||||||
|
// Copyright 2014 Docker, Inc.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
//
|
||||||
|
|
||||||
|
// Code forked from Docker project
|
||||||
|
package daemon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"os"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SdNotify sends a message to the init daemon. It is common to ignore the error.
|
||||||
|
// If `unsetEnvironment` is true, the environment variable `NOTIFY_SOCKET`
|
||||||
|
// will be unconditionally unset.
|
||||||
|
//
|
||||||
|
// It returns one of the following:
|
||||||
|
// (false, nil) - notification not supported (i.e. NOTIFY_SOCKET is unset)
|
||||||
|
// (false, err) - notification supported, but failure happened (e.g. error connecting to NOTIFY_SOCKET or while sending data)
|
||||||
|
// (true, nil) - notification supported, data has been sent
|
||||||
|
func SdNotify(unsetEnvironment bool, state string) (sent bool, err error) {
|
||||||
|
socketAddr := &net.UnixAddr{
|
||||||
|
Name: os.Getenv("NOTIFY_SOCKET"),
|
||||||
|
Net: "unixgram",
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTIFY_SOCKET not set
|
||||||
|
if socketAddr.Name == "" {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if unsetEnvironment {
|
||||||
|
err = os.Unsetenv("NOTIFY_SOCKET")
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
conn, err := net.DialUnix(socketAddr.Net, nil, socketAddr)
|
||||||
|
// Error connecting to NOTIFY_SOCKET
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
_, err = conn.Write([]byte(state))
|
||||||
|
// Error sending the message
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
79
vendor/github.com/coreos/go-systemd/daemon/sdnotify_test.go
generated
vendored
Normal file
79
vendor/github.com/coreos/go-systemd/daemon/sdnotify_test.go
generated
vendored
Normal file
|
|
@ -0,0 +1,79 @@
|
||||||
|
// Copyright 2016 CoreOS, Inc.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package daemon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"net"
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestSdNotify
|
||||||
|
func TestSdNotify(t *testing.T) {
|
||||||
|
|
||||||
|
testDir, e := ioutil.TempDir("/tmp/", "test-")
|
||||||
|
if e != nil {
|
||||||
|
panic(e)
|
||||||
|
}
|
||||||
|
defer os.RemoveAll(testDir)
|
||||||
|
|
||||||
|
notifySocket := testDir + "/notify-socket.sock"
|
||||||
|
laddr := net.UnixAddr{
|
||||||
|
Name: notifySocket,
|
||||||
|
Net: "unixgram",
|
||||||
|
}
|
||||||
|
_, e = net.ListenUnixgram("unixgram", &laddr)
|
||||||
|
if e != nil {
|
||||||
|
panic(e)
|
||||||
|
}
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
unsetEnv bool
|
||||||
|
envSocket string
|
||||||
|
|
||||||
|
wsent bool
|
||||||
|
werr bool
|
||||||
|
}{
|
||||||
|
// (true, nil) - notification supported, data has been sent
|
||||||
|
{false, notifySocket, true, false},
|
||||||
|
// (false, err) - notification supported, but failure happened
|
||||||
|
{true, testDir + "/missing.sock", false, true},
|
||||||
|
// (false, nil) - notification not supported
|
||||||
|
{true, "", false, false},
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, tt := range tests {
|
||||||
|
must(os.Unsetenv("NOTIFY_SOCKET"))
|
||||||
|
if tt.envSocket != "" {
|
||||||
|
must(os.Setenv("NOTIFY_SOCKET", tt.envSocket))
|
||||||
|
}
|
||||||
|
sent, err := SdNotify(tt.unsetEnv, fmt.Sprintf("TestSdNotify test message #%d", i))
|
||||||
|
|
||||||
|
if sent != tt.wsent {
|
||||||
|
t.Errorf("#%d: expected send result %t, got %t", i, tt.wsent, sent)
|
||||||
|
}
|
||||||
|
if tt.werr && err == nil {
|
||||||
|
t.Errorf("#%d: want non-nil err, got nil", i)
|
||||||
|
} else if !tt.werr && err != nil {
|
||||||
|
t.Errorf("#%d: want nil err, got %v", i, err)
|
||||||
|
}
|
||||||
|
if tt.unsetEnv && tt.envSocket != "" && os.Getenv("NOTIFY_SOCKET") != "" {
|
||||||
|
t.Errorf("#%d: environment variable not cleaned up", i)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
72
vendor/github.com/coreos/go-systemd/daemon/watchdog.go
generated
vendored
Normal file
72
vendor/github.com/coreos/go-systemd/daemon/watchdog.go
generated
vendored
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
// Copyright 2016 CoreOS, Inc.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package daemon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SdWatchdogEnabled return watchdog information for a service.
|
||||||
|
// Process should send daemon.SdNotify("WATCHDOG=1") every time / 2.
|
||||||
|
// If `unsetEnvironment` is true, the environment variables `WATCHDOG_USEC`
|
||||||
|
// and `WATCHDOG_PID` will be unconditionally unset.
|
||||||
|
//
|
||||||
|
// It returns one of the following:
|
||||||
|
// (0, nil) - watchdog isn't enabled or we aren't the watched PID.
|
||||||
|
// (0, err) - an error happened (e.g. error converting time).
|
||||||
|
// (time, nil) - watchdog is enabled and we can send ping.
|
||||||
|
// time is delay before inactive service will be killed.
|
||||||
|
func SdWatchdogEnabled(unsetEnvironment bool) (time.Duration, error) {
|
||||||
|
wusec := os.Getenv("WATCHDOG_USEC")
|
||||||
|
wpid := os.Getenv("WATCHDOG_PID")
|
||||||
|
if unsetEnvironment {
|
||||||
|
wusecErr := os.Unsetenv("WATCHDOG_USEC")
|
||||||
|
wpidErr := os.Unsetenv("WATCHDOG_PID")
|
||||||
|
if wusecErr != nil {
|
||||||
|
return 0, wusecErr
|
||||||
|
}
|
||||||
|
if wpidErr != nil {
|
||||||
|
return 0, wpidErr
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if wusec == "" {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
s, err := strconv.Atoi(wusec)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("error converting WATCHDOG_USEC: %s", err)
|
||||||
|
}
|
||||||
|
if s <= 0 {
|
||||||
|
return 0, fmt.Errorf("error WATCHDOG_USEC must be a positive number")
|
||||||
|
}
|
||||||
|
interval := time.Duration(s) * time.Microsecond
|
||||||
|
|
||||||
|
if wpid == "" {
|
||||||
|
return interval, nil
|
||||||
|
}
|
||||||
|
p, err := strconv.Atoi(wpid)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("error converting WATCHDOG_PID: %s", err)
|
||||||
|
}
|
||||||
|
if os.Getpid() != p {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return interval, nil
|
||||||
|
}
|
||||||
85
vendor/github.com/coreos/go-systemd/daemon/watchdog_test.go
generated
vendored
Normal file
85
vendor/github.com/coreos/go-systemd/daemon/watchdog_test.go
generated
vendored
Normal file
|
|
@ -0,0 +1,85 @@
|
||||||
|
// Copyright 2016 CoreOS, Inc.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
package daemon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func must(err error) {
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSdWatchdogEnabled(t *testing.T) {
|
||||||
|
mypid := strconv.Itoa(os.Getpid())
|
||||||
|
tests := []struct {
|
||||||
|
usec string // empty => unset
|
||||||
|
pid string // empty => unset
|
||||||
|
unsetEnv bool // arbitrarily set across testcases
|
||||||
|
|
||||||
|
werr bool
|
||||||
|
wdelay time.Duration
|
||||||
|
}{
|
||||||
|
// Success cases
|
||||||
|
{"100", mypid, true, false, 100 * time.Microsecond},
|
||||||
|
{"50", mypid, true, false, 50 * time.Microsecond},
|
||||||
|
{"1", mypid, false, false, 1 * time.Microsecond},
|
||||||
|
{"1", "", true, false, 1 * time.Microsecond},
|
||||||
|
|
||||||
|
// No-op cases
|
||||||
|
{"", mypid, true, false, 0}, // WATCHDOG_USEC not set
|
||||||
|
{"1", "0", false, false, 0}, // WATCHDOG_PID doesn't match
|
||||||
|
{"", "", true, false, 0}, // Both not set
|
||||||
|
|
||||||
|
// Failure cases
|
||||||
|
{"-1", mypid, true, true, 0}, // Negative USEC
|
||||||
|
{"string", "1", false, true, 0}, // Non-integer USEC value
|
||||||
|
{"1", "string", true, true, 0}, // Non-integer PID value
|
||||||
|
{"stringa", "stringb", false, true, 0}, // E v e r y t h i n g
|
||||||
|
{"-10239", "-eleventythree", true, true, 0}, // i s w r o n g
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, tt := range tests {
|
||||||
|
if tt.usec != "" {
|
||||||
|
must(os.Setenv("WATCHDOG_USEC", tt.usec))
|
||||||
|
} else {
|
||||||
|
must(os.Unsetenv("WATCHDOG_USEC"))
|
||||||
|
}
|
||||||
|
if tt.pid != "" {
|
||||||
|
must(os.Setenv("WATCHDOG_PID", tt.pid))
|
||||||
|
} else {
|
||||||
|
must(os.Unsetenv("WATCHDOG_PID"))
|
||||||
|
}
|
||||||
|
|
||||||
|
delay, err := SdWatchdogEnabled(tt.unsetEnv)
|
||||||
|
|
||||||
|
if tt.werr && err == nil {
|
||||||
|
t.Errorf("#%d: want non-nil err, got nil", i)
|
||||||
|
} else if !tt.werr && err != nil {
|
||||||
|
t.Errorf("#%d: want nil err, got %v", i, err)
|
||||||
|
}
|
||||||
|
if tt.wdelay != delay {
|
||||||
|
t.Errorf("#%d: want delay=%d, got %d", i, tt.wdelay, delay)
|
||||||
|
}
|
||||||
|
if tt.unsetEnv && (os.Getenv("WATCHDOG_PID") != "" || os.Getenv("WATCHDOG_USEC") != "") {
|
||||||
|
t.Errorf("#%d: environment variables not cleaned up", i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
88
vendor/github.com/coreos/go-systemd/test
generated
vendored
Executable file
88
vendor/github.com/coreos/go-systemd/test
generated
vendored
Executable file
|
|
@ -0,0 +1,88 @@
|
||||||
|
#!/bin/bash -e
|
||||||
|
#
|
||||||
|
# Run all tests
|
||||||
|
# ./test
|
||||||
|
# ./test -v
|
||||||
|
#
|
||||||
|
# Run tests for one package
|
||||||
|
# PKG=./foo ./test
|
||||||
|
# PKG=bar ./test
|
||||||
|
#
|
||||||
|
|
||||||
|
# Invoke ./cover for HTML output
|
||||||
|
COVER=${COVER:-"-cover"}
|
||||||
|
|
||||||
|
PROJ="go-systemd"
|
||||||
|
ORG_PATH="github.com/coreos"
|
||||||
|
REPO_PATH="${ORG_PATH}/${PROJ}"
|
||||||
|
|
||||||
|
# As a convenience, set up a self-contained GOPATH if none set
|
||||||
|
if [ -z "$GOPATH" ]; then
|
||||||
|
if [ ! -h gopath/src/${REPO_PATH} ]; then
|
||||||
|
mkdir -p gopath/src/${ORG_PATH}
|
||||||
|
ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
|
||||||
|
fi
|
||||||
|
export GOPATH=${PWD}/gopath
|
||||||
|
go get -u github.com/godbus/dbus
|
||||||
|
go get -u github.com/coreos/pkg/dlopen
|
||||||
|
fi
|
||||||
|
|
||||||
|
TESTABLE="activation daemon journal login1 unit"
|
||||||
|
FORMATTABLE="$TESTABLE sdjournal dbus machine1"
|
||||||
|
if [ -e "/run/systemd/system/" ]; then
|
||||||
|
# if we're on a systemd-system, we can test sdjournal
|
||||||
|
TESTABLE="${TESTABLE} sdjournal"
|
||||||
|
if [ "$EUID" == "0" ]; then
|
||||||
|
# testing actual systemd/machined behaviour requires root
|
||||||
|
TESTABLE="${TESTABLE} dbus machine1"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# user has not provided PKG override
|
||||||
|
if [ -z "$PKG" ]; then
|
||||||
|
TEST=$TESTABLE
|
||||||
|
FMT=$FORMATTABLE
|
||||||
|
|
||||||
|
# user has provided PKG override
|
||||||
|
else
|
||||||
|
# strip out slashes and dots from PKG=./foo/
|
||||||
|
TEST=${PKG//\//}
|
||||||
|
TEST=${TEST//./}
|
||||||
|
|
||||||
|
# only run gofmt on packages provided by user
|
||||||
|
FMT="$TEST"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# split TEST into an array and prepend REPO_PATH to each local package
|
||||||
|
split=(${TEST// / })
|
||||||
|
TEST=${split[@]/#/${REPO_PATH}/}
|
||||||
|
|
||||||
|
echo "Running tests..."
|
||||||
|
go test -v ${COVER} $@ ${TEST}
|
||||||
|
|
||||||
|
echo "Checking gofmt..."
|
||||||
|
fmtRes=$(gofmt -l $FMT)
|
||||||
|
if [ -n "${fmtRes}" ]; then
|
||||||
|
echo -e "gofmt checking failed:\n${fmtRes}"
|
||||||
|
exit 255
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Checking govet..."
|
||||||
|
vetRes=$(go vet $TEST)
|
||||||
|
if [ -n "${vetRes}" ]; then
|
||||||
|
echo -e "govet checking failed:\n${vetRes}"
|
||||||
|
exit 255
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Checking for license header..."
|
||||||
|
licRes=$(for file in $(find . -type f -iname '*.go' ! -path './gopath/*'); do
|
||||||
|
head -n3 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" || echo -e " ${file}"
|
||||||
|
done;)
|
||||||
|
if [ -n "${licRes}" ]; then
|
||||||
|
echo -e "license header checking failed:\n${licRes}"
|
||||||
|
exit 255
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
echo "Success"
|
||||||
Loading…
Add table
Add a link
Reference in a new issue