mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-21 04:59:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from owncloud/socket-listener

Browse Source 
Optionally listen to unix sockets instead of port binding
This commit is contained in:
Thomas Boerger
2019-09-13 15:01:37 +02:00
committed by GitHub
parent 7b508d788c 85b9383aa5
commit e1e5cad606
1 changed files with 102 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
pkg/command/server.go
View File

@@ -2,9 +2,11 @@ package command
import (
"context"
"net"
"net/http"
"os"
"os/signal"
"strings"
"time"
"github.com/oklog/run"
@@ -40,6 +42,45 @@ func Server() *cobra.Command {
Str("addr", viper.GetString("debug.addr")).
Msg("Starting debug server")
if strings.HasPrefix(viper.GetString("debug.addr"), "unix://") {
socket := strings.TrimPrefix(viper.GetString("debug.addr"), "unix://")
if err := os.Remove(socket); err != nil && !os.IsNotExist(err) {
log.Error().
Err(err).
Str("socket", socket).
Msg("Failed to remove existing debug socket")
return err
}
listener, err := net.ListenUnix(
"unix",
&net.UnixAddr{
Name: socket,
Net: "unix",
},
)
if err != nil {
log.Error().
Err(err).
Msg("Failed to initialize debug unix socket")
return err
}
if err = os.Chmod(socket, os.FileMode(0666)); err != nil {
log.Error().
Err(err).
Msg("Failed to change debug socket permissions")
return err
}
return server.Serve(listener)
}
return server.ListenAndServe()
}, func(reason error) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -53,6 +94,17 @@ func Server() *cobra.Command {
return
}
if strings.HasPrefix(viper.GetString("debug.addr"), "unix://") {
socket := strings.TrimPrefix(viper.GetString("debug.addr"), "unix://")
if err := os.Remove(socket); err != nil && !os.IsNotExist(err) {
log.Error().
Err(err).
Str("socket", socket).
Msg("Failed to remove debug server socket")
}
}
log.Info().
Err(reason).
Msg("Shutdown debug server gracefully")
@@ -76,6 +128,45 @@ func Server() *cobra.Command {
Str("addr", viper.GetString("http.addr")).
Msg("Starting http server")
if strings.HasPrefix(viper.GetString("http.addr"), "unix://") {
socket := strings.TrimPrefix(viper.GetString("http.addr"), "unix://")
if err := os.Remove(socket); err != nil && !os.IsNotExist(err) {
log.Error().
Err(err).
Str("socket", socket).
Msg("Failed to remove existing http socket")
return err
}
listener, err := net.ListenUnix(
"unix",
&net.UnixAddr{
Name: socket,
Net: "unix",
},
)
if err != nil {
log.Error().
Err(err).
Msg("Failed to initialize http unix socket")
return err
}
if err = os.Chmod(socket, os.FileMode(0666)); err != nil {
log.Error().
Err(err).
Msg("Failed to change http socket permissions")
return err
}
return server.Serve(listener)
}
return server.ListenAndServe()
}, func(reason error) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -89,6 +180,17 @@ func Server() *cobra.Command {
return
}
if strings.HasPrefix(viper.GetString("http.addr"), "unix://") {
socket := strings.TrimPrefix(viper.GetString("http.addr"), "unix://")
if err := os.Remove(socket); err != nil && !os.IsNotExist(err) {
log.Error().
Err(err).
Str("socket", socket).
Msg("Failed to remove http server socket")
}
}
log.Info().
Err(reason).
Msg("Shutdown http server gracefully")