Change method names and some log messages

Icinga · Oct 10, 2023 · aab13a9 · aab13a9
1 parent da2497c
commit aab13a9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/cmd/channel/email/main.go b/cmd/channel/email/main.go
@@ -51,7 +51,7 @@ func (ch *Email) SendNotification(req *plugin.NotificationRequest) error {
 func (ch *Email) SetConfig(jsonStr json.RawMessage) error {
 	err := json.Unmarshal(jsonStr, ch)
 	if err != nil {
-		return fmt.Errorf("failed to load config:%s %w", jsonStr, err)
+		return fmt.Errorf("failed to load config: %s %w", jsonStr, err)
 	}
 
 	if ch.Host == "" {

diff --git a/internal/channel/channel.go b/internal/channel/channel.go
@@ -25,7 +25,7 @@ type Channel struct {
 	mu     sync.Mutex
 }
 
-func (c *Channel) StartPlugin(pluginDir string) error {
+func (c *Channel) Start(pluginDir string) error {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
@@ -79,12 +79,12 @@ func (c *Channel) StartPlugin(pluginDir string) error {
 	return nil
 }
 
-func (c *Channel) ResetPlugin() {
+func (c *Channel) Stop() {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
 	if c.cmd == nil {
-		c.Logger.Debug("channel has already been reset")
+		c.Logger.Debug("channel plugin has already been stopped")
 		return
 	}
 
@@ -93,7 +93,7 @@ func (c *Channel) ResetPlugin() {
 	c.cmd = nil
 	c.rpc = nil
 
-	c.Logger.Debug("reset channel successfully")
+	c.Logger.Debug("Stopped channel plugin successfully")
 }
 
 func forwardLogs(errPipe io.Reader, logger *zap.SugaredLogger) {
@@ -114,15 +114,15 @@ func forwardLogs(errPipe io.Reader, logger *zap.SugaredLogger) {
 
 // run as go routine to terminate given channel
 func (c *Channel) terminate(cmd *exec.Cmd, rpc *rpc.RPC) {
-	c.Logger.Debug("terminating channel")
+	c.Logger.Debug("terminating channel plugin")
 	_ = rpc.Close()
 
 	timer := time.AfterFunc(5*time.Second, func() {
-		c.Logger.Debug("killing the channel")
+		c.Logger.Debug("killing the channel plugin")
 		_ = cmd.Process.Kill()
 	})
 
 	_ = cmd.Wait()
 	timer.Stop()
-	c.Logger.Debug("Channel terminated successfully")
+	c.Logger.Debug("Channel plugin terminated successfully")
 }
diff --git a/internal/channel/plugin.go b/internal/channel/plugin.go
@@ -79,7 +79,7 @@ func (c *Channel) rpcCall(method string, params json.RawMessage) (json.RawMessag
 
 	var rpcErr *rpc.Error
 	if errors.As(err, &rpcErr) {
-		c.ResetPlugin()
+		c.Stop()
 	}
 
 	return result, err

diff --git a/internal/config/channel.go b/internal/config/channel.go
@@ -67,8 +67,8 @@ func (r *RuntimeConfig) applyPendingChannels() {
 				currentChannel.Name = pendingChannel.Name
 				currentChannel.Config = pendingChannel.Config
 
-				currentChannel.Logger.Info("Resetting the channel because the config has been changed")
-				currentChannel.ResetPlugin()
+				currentChannel.Logger.Info("Stopping the channel plugin because the config has been changed")
+				currentChannel.Stop()
 			}
 		} else {
 			r.Channels[typ] = pendingChannel

diff --git a/internal/incident/incident.go b/internal/incident/incident.go
@@ -439,7 +439,7 @@ func (i *Incident) notifyContacts(ctx context.Context, tx *sqlx.Tx, ev *event.Ev
 				continue
 			}
 
-			err = ch.StartPlugin(i.configFile.ChannelPluginDir)
+			err = ch.Start(i.configFile.ChannelPluginDir)
 			if err != nil {
 				i.logger.Errorw("Could not initialize channel", zap.String("type", chType), zap.Error(err))
 				continue