diff --git a/.golangci.yml b/.golangci.yml index ccd3c1a..23e2762 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,6 +4,7 @@ linters: - forbidigo - misspell - whitespace + - gochecknoinits settings: forbidigo: forbid: @@ -22,6 +23,9 @@ linters: - linters: - errcheck path: _test.go + - linters: + - gochecknoinits + path: internal/logging/sse.go paths: - third_party$ - builtin$ diff --git a/display.go b/display.go index f4d2a94..2a22351 100644 --- a/display.go +++ b/display.go @@ -370,9 +370,7 @@ func startBacklightTickers() { } } -func init() { - ensureConfigLoaded() - +func initDisplay() { go func() { waitCtrlClientConnected() displayLogger.Info().Msg("setting initial display contents") diff --git a/jiggler.go b/jiggler.go index 94f7d15..0a33fd6 100644 --- a/jiggler.go +++ b/jiggler.go @@ -15,9 +15,7 @@ func rpcGetJigglerState() bool { return jigglerEnabled } -func init() { - ensureConfigLoaded() - +func initJiggler() { go runJiggler() } diff --git a/main.go b/main.go index aa743d9..c25d8b8 100644 --- a/main.go +++ b/main.go @@ -75,8 +75,8 @@ func Main() { } }() + // initialize usb gadget initUsbGadget() - if err := setInitialVirtualMediaState(); err != nil { logger.Warn().Err(err).Msg("failed to set initial virtual media state") } @@ -84,6 +84,10 @@ func Main() { if err := initImagesFolder(); err != nil { logger.Warn().Err(err).Msg("failed to init images folder") } + initJiggler() + + // initialize display + initDisplay() go func() { time.Sleep(15 * time.Minute)