diff --git a/cmd/cmd.go b/cmd/cmd.go deleted file mode 100644 index 357a9d65..00000000 --- a/cmd/cmd.go +++ /dev/null @@ -1,41 +0,0 @@ -package cmd - -import ( - "github.com/AlexxIT/go2rtc/cmd/api" - "github.com/AlexxIT/go2rtc/cmd/app" - "github.com/AlexxIT/go2rtc/cmd/exec" - "github.com/AlexxIT/go2rtc/cmd/ffmpeg" - "github.com/AlexxIT/go2rtc/cmd/hass" - "github.com/AlexxIT/go2rtc/cmd/mse" - "github.com/AlexxIT/go2rtc/cmd/ngrok" - "github.com/AlexxIT/go2rtc/cmd/rtmp" - "github.com/AlexxIT/go2rtc/cmd/rtsp" - "github.com/AlexxIT/go2rtc/cmd/streams" - "github.com/AlexxIT/go2rtc/cmd/webrtc" - "os" - "os/signal" -) - -func Run() { - app.Init() // init config and logs - streams.Init() // load streams list - - rtsp.Init() // add support RTSP client and RTSP server - rtmp.Init() // add support RTMP client - exec.Init() // add support exec scheme (depends on RTSP server) - ffmpeg.Init() // add support ffmpeg scheme (depends on exec scheme) - hass.Init() // add support hass scheme - - api.Init() // init HTTP API server - - webrtc.Init() - mse.Init() - - ngrok.Init() - - c := make(chan os.Signal) - signal.Notify(c) - <-c - - println("exit OK") -} diff --git a/main.go b/main.go index e13134b6..d9a03e2d 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,42 @@ package main -import "github.com/AlexxIT/go2rtc/cmd" +import ( + "github.com/AlexxIT/go2rtc/cmd/api" + "github.com/AlexxIT/go2rtc/cmd/app" + "github.com/AlexxIT/go2rtc/cmd/exec" + "github.com/AlexxIT/go2rtc/cmd/ffmpeg" + "github.com/AlexxIT/go2rtc/cmd/hass" + "github.com/AlexxIT/go2rtc/cmd/mse" + "github.com/AlexxIT/go2rtc/cmd/ngrok" + "github.com/AlexxIT/go2rtc/cmd/rtmp" + "github.com/AlexxIT/go2rtc/cmd/rtsp" + "github.com/AlexxIT/go2rtc/cmd/streams" + "github.com/AlexxIT/go2rtc/cmd/webrtc" + "os" + "os/signal" + "syscall" +) func main() { - cmd.Run() + app.Init() // init config and logs + streams.Init() // load streams list + + rtsp.Init() // add support RTSP client and RTSP server + rtmp.Init() // add support RTMP client + exec.Init() // add support exec scheme (depends on RTSP server) + ffmpeg.Init() // add support ffmpeg scheme (depends on exec scheme) + hass.Init() // add support hass scheme + + api.Init() // init HTTP API server + + webrtc.Init() + mse.Init() + + ngrok.Init() + + sigs := make(chan os.Signal, 1) + signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM) + <-sigs + + println("exit OK") }