From 806d7bd13978c7895d3442cc0690ff2a41bebc54 Mon Sep 17 00:00:00 2001 From: Vladimir Stoilov Date: Fri, 29 Jul 2022 10:50:38 +0200 Subject: [PATCH 1/2] Ignore disabled event log viewer at startup --- cmds/portmaster-start/service_windows.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cmds/portmaster-start/service_windows.go b/cmds/portmaster-start/service_windows.go index 077dffbf..f969b060 100644 --- a/cmds/portmaster-start/service_windows.go +++ b/cmds/portmaster-start/service_windows.go @@ -105,9 +105,13 @@ func runService(_ *cobra.Command, opts *Options, cmdArgs []string) error { // open eventlog elog, err := eventlog.Open(serviceName) if err != nil { - return fmt.Errorf("failed to open eventlog: %s", err) + logControlError(fmt.Errorf("failed to open eventlog: %s", err)) } - defer elog.Close() + defer func() { + if elog != nil { + elog.Close() + } + }() runWg.Add(2) finishWg.Add(1) @@ -134,7 +138,9 @@ func runService(_ *cobra.Command, opts *Options, cmdArgs []string) error { err = getShutdownError() if err != nil { log.Printf("%s service experienced an error: %s\n", serviceName, err) - _ = elog.Error(1, fmt.Sprintf("%s experienced an error: %s", serviceName, err)) + if elog != nil { + _ = elog.Error(1, fmt.Sprintf("%s experienced an error: %s", serviceName, err)) + } } return err From a4a4fd798404f95d3225ef0ea0a2d0399eeb67fe Mon Sep 17 00:00:00 2001 From: Vladimir Stoilov Date: Fri, 29 Jul 2022 11:14:29 +0200 Subject: [PATCH 2/2] Remove use of event log viewer --- cmds/portmaster-start/service_windows.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/cmds/portmaster-start/service_windows.go b/cmds/portmaster-start/service_windows.go index f969b060..f43b632a 100644 --- a/cmds/portmaster-start/service_windows.go +++ b/cmds/portmaster-start/service_windows.go @@ -14,7 +14,6 @@ import ( "github.com/spf13/cobra" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" - "golang.org/x/sys/windows/svc/eventlog" ) var ( @@ -102,17 +101,6 @@ func runService(_ *cobra.Command, opts *Options, cmdArgs []string) error { svcRun = debug.Run } - // open eventlog - elog, err := eventlog.Open(serviceName) - if err != nil { - logControlError(fmt.Errorf("failed to open eventlog: %s", err)) - } - defer func() { - if elog != nil { - elog.Close() - } - }() - runWg.Add(2) finishWg.Add(1) @@ -138,9 +126,6 @@ func runService(_ *cobra.Command, opts *Options, cmdArgs []string) error { err = getShutdownError() if err != nil { log.Printf("%s service experienced an error: %s\n", serviceName, err) - if elog != nil { - _ = elog.Error(1, fmt.Sprintf("%s experienced an error: %s", serviceName, err)) - } } return err