curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix macos and windows service (env unused)

This commit is contained in:
iBug 2023-07-18 01:14:13 +08:00
parent faa43cde1c
commit d2ec6de56b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cloudflared/macos_service.go
View File

@ -132,7 +132,7 @@ func installLaunchd(c *cli.Context) error {
log.Err(err).Msg("Error determining install path") log.Err(err).Msg("Error determining install path")
return errors.Wrap(err, "Error determining install path") return errors.Wrap(err, "Error determining install path")
} }
extraArgs, err := getServiceExtraArgsFromCliArgs(c, log) extraArgs, extraEnv, err := getServiceExtraArgsFromCliArgs(c, log)
if err != nil { if err != nil {
errMsg := "Unable to determine extra arguments for launch daemon" errMsg := "Unable to determine extra arguments for launch daemon"
log.Err(err).Msg(errMsg) log.Err(err).Msg(errMsg)
@ -150,7 +150,7 @@ func installLaunchd(c *cli.Context) error {
return errors.Wrap(err, "error determining stderr path") return errors.Wrap(err, "error determining stderr path")
} }
launchdTemplate := newLaunchdTemplate(installPath, stdoutPath, stderrPath) launchdTemplate := newLaunchdTemplate(installPath, stdoutPath, stderrPath)
templateArgs := ServiceTemplateArgs{Path: etPath, ExtraArgs: extraArgs} templateArgs := ServiceTemplateArgs{Path: etPath, ExtraArgs: extraArgs, Env: extraEnv}
err = launchdTemplate.Generate(&templateArgs) err = launchdTemplate.Generate(&templateArgs)
if err != nil { if err != nil {
log.Err(err).Msg("error generating launchd template") log.Err(err).Msg("error generating launchd template")

3
cmd/cloudflared/windows_service.go
View File

@ -193,12 +193,13 @@ func installWindowsService(c *cli.Context) error {
s.Close() s.Close()
return fmt.Errorf(serviceAlreadyExistsWarn(windowsServiceName)) return fmt.Errorf(serviceAlreadyExistsWarn(windowsServiceName))
} }
extraArgs, err := getServiceExtraArgsFromCliArgs(c, &log) extraArgs, extraEnv, err := getServiceExtraArgsFromCliArgs(c, &log)
if err != nil { if err != nil {
errMsg := "Unable to determine extra arguments for windows service" errMsg := "Unable to determine extra arguments for windows service"
log.Err(err).Msg(errMsg) log.Err(err).Msg(errMsg)
return errors.Wrap(err, errMsg) return errors.Wrap(err, errMsg)
} }
_ = extraEnv // No use for this on Windows
config := mgr.Config{StartType: mgr.StartAutomatic, DisplayName: windowsServiceDescription} config := mgr.Config{StartType: mgr.StartAutomatic, DisplayName: windowsServiceDescription}
s, err = m.CreateService(windowsServiceName, exepath, config, extraArgs...) s, err = m.CreateService(windowsServiceName, exepath, config, extraArgs...)