github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

🗑️ Refactor service structure for improved code clarity

Browse Source 
Renamed the program struct to agentService and updated related methods and variables for consistency. This enhances readability and aligns naming conventions with the underlying functionality. Minor adjustments made to configuration handling and formatting for better maintainability.
This commit is contained in:
Tony An
2025-02-27 08:52:46 -06:00
parent a4420a06c1
commit 39c8acc720
1 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
InfrastructureAgent/main.go
View File

@@ -10,41 +10,40 @@ import (
"github.com/kardianos/service"
)
type program struct {
exit chan struct{}
agent *Agent
config *ConfigFile
type agentService struct {
stopChan chan struct{}
agent *Agent
config *ConfigFile
}
func (p *program) Start(s service.Service) error {
func (a *agentService) Start(s service.Service) error {
if service.Interactive() {
slog.Info("Running in terminal.")
} else {
slog.Info("Running under service manager.")
}
p.exit = make(chan struct{})
// Start should not block. Do the actual work async.
go p.run()
a.stopChan = make(chan struct{})
go a.runAgent()
return nil
}
func (p *program) run() {
p.agent = NewAgent(p.config.SecretKey, p.config.OneUptimeURL, p.config.ProxyURL)
p.agent.Start()
func (a *agentService) runAgent() {
a.agent = NewAgent(a.config.SecretKey, a.config.OneUptimeURL, a.config.ProxyURL)
a.agent.Start()
if service.Interactive() {
slog.Info("Running in terminal.")
NewShutdownHook().Close(func() {
slog.Info("Service Exiting...")
p.agent.Close()
a.agent.Close()
})
} else {
slog.Info("Running under service manager.")
for {
select {
case _, ok := <-p.exit:
case _, ok := <-a.stopChan:
if !ok {
slog.Info("Service Exiting...")
p.agent.Close()
a.agent.Close()
return
}
}
@@ -52,19 +51,17 @@ func (p *program) run() {
}
}
func (p *program) Stop(s service.Service) error {
close(p.exit)
func (a *agentService) Stop(s service.Service) error {
close(a.stopChan)
return nil
}
func main() {
slog.Info("OneUptime Infrastructure Agent")
// Set up the configuration
config.WithOptions(config.WithTagName("json"))
cfg := newConfigFile()
// Set up the service
config.WithOptions(config.WithTagName("json"))
cfgFile := newConfigFile()
svcConfig := &service.Config{
Name: "oneuptime-infrastructure-agent",
DisplayName: "OneUptime Infrastructure Agent",
@@ -72,13 +69,11 @@ func main() {
Arguments: []string{"run"},
}
// Set up the program
prg := &program{
config: cfg,
agentSvc := &agentService{
config: cfgFile,
}
// Create the service
s, err := service.New(prg, svcConfig)
s, err := service.New(agentSvc, svcConfig)
if err != nil {
slog.Error(err.Error())
os.Exit(2)
@@ -89,49 +84,37 @@ func main() {
switch cmd {
case "configure":
installFlags := flag.NewFlagSet("configure", flag.ExitOnError)
secretKey := installFlags.String("secret-key", "", "Secret key of this monitor. You can find this on OneUptime dashboard (required)")
secretKey := installFlags.String("secret-key", "", "Secret key of this monitor, you can find this on OneUptime dashboard (required)")
oneuptimeURL := installFlags.String("oneuptime-url", "", "Oneuptime endpoint root URL (required)")
// Take input - proxy URL, proxy port, username / password - all optional
proxyURL := installFlags.String("proxy-url", "", "Proxy URL - if you are using a proxy (optional)")
proxyURL := installFlags.String("proxy-url", "", "Proxy URL (optional)")
err := installFlags.Parse(os.Args[2:])
if err != nil {
slog.Error(err.Error())
os.Exit(2)
}
prg.config.SecretKey = *secretKey
prg.config.OneUptimeURL = *oneuptimeURL
prg.config.ProxyURL = *proxyURL
if prg.config.SecretKey == "" || prg.config.OneUptimeURL == "" {
agentSvc.config.SecretKey = *secretKey
agentSvc.config.OneUptimeURL = *oneuptimeURL
agentSvc.config.ProxyURL = *proxyURL
if agentSvc.config.SecretKey == "" || agentSvc.config.OneUptimeURL == "" {
slog.Error("The --secret-key and --oneuptime-url flags are required for the 'configure' command")
os.Exit(2)
}
slog.Info("Configuring service...")
slog.Info("Secret key: " + *secretKey)
slog.Info("OneUptime URL: " + *oneuptimeURL)
slog.Info("Proxy URL: " + *proxyURL)
// save configuration
err = prg.config.save(prg.config.SecretKey, prg.config.OneUptimeURL, prg.config.ProxyURL)
err = agentSvc.config.save(agentSvc.config.SecretKey, agentSvc.config.OneUptimeURL, agentSvc.config.ProxyURL)
if err != nil {
slog.Error(err.Error())
os.Exit(2)
}
// Install the service
if err := s.Install(); err != nil {
slog.Error("Failed to configure service. Please consider uninstalling the service by running 'oneuptime-infrastructure-agent uninstall' and run configure again. \n", err)
os.Exit(2)
}
fmt.Println("Service installed. Run the service using 'oneuptime-infrastructure-agent start'")
case "start":
err := prg.config.loadConfig()
err := agentSvc.config.loadConfig()
if os.IsNotExist(err) {
slog.Error("Service configuration not found. Please run 'oneuptime-infrastructure-agent configure' to configure the service.")
os.Exit(2)
@@ -140,20 +123,18 @@ func main() {
slog.Error(err.Error())
os.Exit(2)
}
if prg.config.SecretKey == "" || prg.config.OneUptimeURL == "" {
if agentSvc.config.SecretKey == "" || agentSvc.config.OneUptimeURL == "" {
slog.Error("Service configuration not found or is incomplete. Please run 'oneuptime-infrastructure-agent configure' to configure the service.")
os.Exit(2)
}
err = s.Start()
if err != nil {
slog.Error(err.Error())
os.Exit(1)
}
slog.Info("OneUptime Infrastructure Agent Started")
case "run":
err := prg.config.loadConfig()
err := agentSvc.config.loadConfig()
if os.IsNotExist(err) {
slog.Error("Service configuration not found. Please run 'oneuptime-infrastructure-agent configure' to configure the service.")
os.Exit(2)
@@ -162,7 +143,7 @@ func main() {
slog.Error(err.Error())
os.Exit(2)
}
if prg.config.SecretKey == "" || prg.config.OneUptimeURL == "" {
if agentSvc.config.SecretKey == "" || agentSvc.config.OneUptimeURL == "" {
slog.Error("Service configuration not found or is incomplete. Please run 'oneuptime-infrastructure-agent configure' to configure the service.")
os.Exit(2)
}
@@ -171,45 +152,37 @@ func main() {
slog.Error(err.Error())
os.Exit(1)
}
case "uninstall", "stop", "restart":
err := service.Control(s, cmd)
if err != nil {
slog.Error(err.Error())
os.Exit(2)
}
if cmd == "uninstall" {
// remove configuration file
err := prg.config.removeConfigFile()
err := agentSvc.config.removeConfigFile()
if err != nil {
slog.Error(err.Error())
os.Exit(2)
}
slog.Info("Service Uninstalled")
}
if cmd == "stop" {
slog.Info("Service Stopped")
}
if cmd == "restart" {
slog.Info("Service Restarted")
}
// add help command
case "help":
fmt.Println("Usage: oneuptime-infrastructure-agent configure | uninstall | start | stop | restart")
case "status":
s, err := s.Status()
sc, err := s.Status()
if err != nil {
slog.Error(err.Error())
os.Exit(2)
}
if s == service.StatusRunning {
if sc == service.StatusRunning {
slog.Info("Service is running")
} else if s == service.StatusStopped {
} else if sc == service.StatusStopped {
slog.Info("Service is stopped")
} else {
slog.Info("Service status unknown")