mirror of
https://codeberg.org/cunicu/cunicu.git
synced 2025-10-09 02:30:10 +08:00
allow GRPC signaling server to listen on non-TLS sockets
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
@@ -5,8 +5,10 @@ import (
|
|||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
|
"google.golang.org/grpc"
|
||||||
|
"google.golang.org/grpc/credentials/insecure"
|
||||||
"riasc.eu/wice/pkg"
|
"riasc.eu/wice/pkg"
|
||||||
"riasc.eu/wice/pkg/signaling/grpc"
|
grpcx "riasc.eu/wice/pkg/signaling/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -18,11 +20,13 @@ var (
|
|||||||
}
|
}
|
||||||
|
|
||||||
listenAddress string
|
listenAddress string
|
||||||
|
secure = false
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
pf := signalCmd.PersistentFlags()
|
pf := signalCmd.PersistentFlags()
|
||||||
pf.StringVarP(&listenAddress, "listen", "L", ":443", "listen address")
|
pf.StringVarP(&listenAddress, "listen", "L", ":8080", "listen address")
|
||||||
|
pf.BoolVarP(&secure, "secure", "S", false, "listen with TLS")
|
||||||
|
|
||||||
RootCmd.AddCommand(signalCmd)
|
RootCmd.AddCommand(signalCmd)
|
||||||
}
|
}
|
||||||
@@ -33,7 +37,13 @@ func signal(cmd *cobra.Command, args []string) {
|
|||||||
logger.Fatal("Failed to listen", zap.Error(err))
|
logger.Fatal("Failed to listen", zap.Error(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
svr := grpc.NewServer()
|
// Disable TLS
|
||||||
|
opts := []grpc.ServerOption{}
|
||||||
|
if !secure {
|
||||||
|
opts = append(opts, grpc.Creds(insecure.NewCredentials()))
|
||||||
|
}
|
||||||
|
|
||||||
|
svr := grpcx.NewServer(opts...)
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
for sig := range pkg.SetupSignals() {
|
for sig := range pkg.SetupSignals() {
|
||||||
|
@@ -21,7 +21,7 @@ type Server struct {
|
|||||||
logger *zap.Logger
|
logger *zap.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewServer() *Server {
|
func NewServer(opt ...grpc.ServerOption) *Server {
|
||||||
logger := zap.L().Named("server")
|
logger := zap.L().Named("server")
|
||||||
|
|
||||||
s := &Server{
|
s := &Server{
|
||||||
|
Reference in New Issue
Block a user