diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-02-10 14:24:10 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-02-17 10:29:32 -0700 |
| commit | c0c44ae8a36121dc13f7984cf8b3347c21f43f51 (patch) | |
| tree | 489bc30b7987a1dcf31ca2e8ba96a370e72e4a86 /pkg/api/server/register_swarm.go | |
| parent | 640b11f0028057ca2090d61c4e460c1afadb226c (diff) | |
| download | podman-c0c44ae8a36121dc13f7984cf8b3347c21f43f51.tar.gz podman-c0c44ae8a36121dc13f7984cf8b3347c21f43f51.tar.bz2 podman-c0c44ae8a36121dc13f7984cf8b3347c21f43f51.zip | |
Fix handler and systemd activation errors
On panic from handler: log warning and stack trace, report
InternalServerError to client
When using `podman system service` make determining the listening endpoint deterministic.
// When determining _*THE*_ listening endpoint --
// 1) User input wins always
// 2) systemd socket activation
// 3) rootless honors XDG_RUNTIME_DIR
// 4) if varlink -- adapter.DefaultVarlinkAddress
// 5) lastly adapter.DefaultAPIAddress
Fixes #5150
Fixes #5151
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'pkg/api/server/register_swarm.go')
| -rw-r--r-- | pkg/api/server/register_swarm.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/api/server/register_swarm.go b/pkg/api/server/register_swarm.go index 63d8acfde..e37ac4e41 100644 --- a/pkg/api/server/register_swarm.go +++ b/pkg/api/server/register_swarm.go @@ -9,7 +9,7 @@ import ( "github.com/sirupsen/logrus" ) -func (s *APIServer) RegisterSwarmHandlers(r *mux.Router) error { +func (s *APIServer) registerSwarmHandlers(r *mux.Router) error { r.PathPrefix("/v{version:[0-9.]+}/configs/").HandlerFunc(noSwarm) r.PathPrefix("/v{version:[0-9.]+}/nodes/").HandlerFunc(noSwarm) r.PathPrefix("/v{version:[0-9.]+}/secrets/").HandlerFunc(noSwarm) |