Skip to content

Commit 554121a

Browse files
authored
chore: ensure config is loaded before init functions (#226)
1 parent d4efd72 commit 554121a

File tree

5 files changed

+16
-0
lines changed

5 files changed

+16
-0
lines changed

config.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,9 @@ func SaveConfig() error {
116116

117117
return nil
118118
}
119+
120+
func ensureConfigLoaded() {
121+
if config == nil {
122+
LoadConfig()
123+
}
124+
}

display.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ func startBacklightTickers() {
248248
}
249249

250250
func init() {
251+
ensureConfigLoaded()
252+
251253
go func() {
252254
waitCtrlClientConnected()
253255
fmt.Println("setting initial display contents")

jiggler.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ func rpcGetJigglerState() bool {
2020
}
2121

2222
func init() {
23+
ensureConfigLoaded()
24+
2325
go runJiggler()
2426
}
2527

network.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ func getNTPServersFromDHCPInfo() ([]string, error) {
190190
}
191191

192192
func init() {
193+
ensureConfigLoaded()
194+
193195
updates := make(chan netlink.LinkUpdate)
194196
done := make(chan struct{})
195197

usb.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ func mountConfigFS() error {
3434
}
3535

3636
func init() {
37+
ensureConfigLoaded()
38+
3739
_ = os.MkdirAll(imagesFolder, 0755)
3840
udcs := gadget.GetUdcs()
3941
if len(udcs) < 1 {
@@ -383,6 +385,8 @@ func triggerUSBStateUpdate() {
383385
var udc string
384386

385387
func init() {
388+
ensureConfigLoaded()
389+
386390
go func() {
387391
for {
388392
newState := rpcGetUSBState()

0 commit comments

Comments
 (0)