Skip to content

Commit

Permalink
Move Windows service initialization above patching
Browse files Browse the repository at this point in the history
  • Loading branch information
zwass committed Sep 25, 2024
1 parent b3aed9a commit 9139967
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions orbit/cmd/orbit/orbit.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,22 @@ func main() {
reloadLaunchDaemon()
}

var (
g run.Group
appDoneCh chan struct{} // closed when runner run.group.Run() returns
)

// Setting up the system service management early on the process lifetime
appDoneCh = make(chan struct{})

// Initializing windows service runner and system service manager.
if runtime.GOOS == "windows" {
systemChecker := newSystemChecker()
addSubsystem(&g, "system checker", systemChecker)
go osservice.SetupServiceManagement(constant.SystemServiceName, systemChecker.svcInterruptCh, appDoneCh)
time.Sleep(1 * time.Second)
}

checkAndPatchCertificate(c.String("root-dir"))

// Override flags with values retrieved from Fleet.
Expand Down Expand Up @@ -473,20 +489,8 @@ func main() {
var (
osquerydPath string
desktopPath string
g run.Group
appDoneCh chan struct{} // closed when runner run.group.Run() returns
)

// Setting up the system service management early on the process lifetime
appDoneCh = make(chan struct{})

// Initializing windows service runner and system service manager.
if runtime.GOOS == "windows" {
systemChecker := newSystemChecker()
addSubsystem(&g, "system checker", systemChecker)
go osservice.SetupServiceManagement(constant.SystemServiceName, systemChecker.svcInterruptCh, appDoneCh)
}

// sofwareupdated is a macOS daemon that automatically updates Apple software.
if c.Bool("disable-kickstart-softwareupdated") && runtime.GOOS == "darwin" {
log.Warn().Msg("fleetd no longer automatically kickstarts softwareupdated. The --disable-kickstart-softwareupdated flag, which was previously used to disable this behavior, has been deprecated and will be removed in a future version")
Expand Down

0 comments on commit 9139967

Please sign in to comment.