xevion/HATray
1
0
Fork 0
mirror of https://github.com/Xevion/HATray.git synced 2025-12-06 01:15:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move heartbeat above, better comments & debug logs

Browse Source
This commit is contained in:
Xevion
2025-06-23 15:09:23 -05:00
parent 8d0bb4607e
commit 6e01443b06
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/service/windows.go
View File

@@ -38,18 +38,21 @@ func (svc *WindowsService) Run() error {
if err != nil { if err != nil {
return fmt.Errorf("failed to determine if running as Windows service: %v", err) return fmt.Errorf("failed to determine if running as Windows service: %v", err)
} }
svc.logger.Debug("isService", "value", isService)
var run func(string, winsvc.Handler) error var run func(string, winsvc.Handler) error
// Acquire the appropriate run function & eventlog instance depending on service type // Acquire the appropriate run function & eventlog instance depending on service type
if isService { if isService {
svc.logger.Debug("running as Windows service", "serviceName", serviceName)
run = winsvc.Run run = winsvc.Run
svc.elog, err = eventlog.Open(serviceName) svc.elog, err = eventlog.Open(serviceName)
if err != nil { if err != nil {
return fmt.Errorf("failed to open event log: %v", err) return fmt.Errorf("failed to open event log: %v", err)
} }
} else { } else {
svc.logger.Debug("running as debug service", "serviceName", serviceName)
run = debug.Run run = debug.Run
svc.elog = debug.New(serviceName) svc.elog = debug.New(serviceName)
} }
@@ -86,14 +89,23 @@ func (handler *serviceHandler) Execute(args []string, r <-chan winsvc.ChangeRequ
for { for {
select { select {
// handle heartbeat
case <-ticker.C:
// TODO: in debug mode, I'd like heartbeats to have more interactive, changing information, such as state details, connection status, runtime etc.
handler.service.logger.Debug("heartbeat")
// handle service control requests
case c := <-r: case c := <-r:
handler.service.logger.Debug("service control request", "request", c)
switch c.Cmd { switch c.Cmd {
case winsvc.Interrogate: case winsvc.Interrogate:
changes <- c.CurrentStatus changes <- c.CurrentStatus
handler.service.logger.Debug("service interrogate", "status", c.CurrentStatus)
case winsvc.Stop, winsvc.Shutdown: case winsvc.Stop, winsvc.Shutdown:
changes <- winsvc.Status{State: winsvc.StopPending} changes <- winsvc.Status{State: winsvc.StopPending}
handler.service.logger.Info("service stopping") handler.service.logger.Info("service stopping", "shutdown", c.Cmd == winsvc.Shutdown)
if err := handler.service.app.Stop(); err != nil { if err := handler.service.app.Stop(); err != nil {
handler.service.logger.Error("Failed to stop app layer", "error", err) handler.service.logger.Error("Failed to stop app layer", "error", err)
} }
@@ -117,8 +129,6 @@ func (handler *serviceHandler) Execute(args []string, r <-chan winsvc.ChangeRequ
handler.service.logger.Error("unexpected control request", "request", c) handler.service.logger.Error("unexpected control request", "request", c)
handler.service.elog.Error(uint32(1), fmt.Sprintf("unexpected control request #%d", c)) handler.service.elog.Error(uint32(1), fmt.Sprintf("unexpected control request #%d", c))
} }
case <-ticker.C:
handler.service.logger.Debug("heartbeat")
} }
} }
} }