code(pkg/notifier) - imrpove console

PxyUp · Jan 31, 2024 · d4fe27b · d4fe27b
1 parent 0b53834
commit d4fe27b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -212,7 +212,9 @@ type HttpConfig struct {
 	Timeout uint32            `yaml:"timeout" json:"timeout"`
 }
 
-type ConsoleConfig struct{}
+type ConsoleConfig struct {
+	OnlyResult bool `json:"only_result" yaml:"only_result"`
+}
 
 type RedisNotifierConfig struct {
 	Addr     string `json:"addr" yaml:"addr"`

diff --git a/pkg/notifier/console.go b/pkg/notifier/console.go
@@ -16,6 +16,15 @@ type console struct {
 }
 
 func (o *console) notify(record *singleRecord) error {
+	if o.cfg.OnlyResult {
+		_, errOut := fmt.Fprintln(os.Stdout, string(record.Body))
+		if errOut != nil {
+			o.logger.Errorw("cant send to stdout", "error", errOut.Error())
+			return errOut
+		}
+		return nil
+	}
+
 	bb, err := json.Marshal(record)
 	if err != nil {
 		o.logger.Errorw("cant unmarshal record", "error", err.Error())

diff --git a/pkg/notifier/telegram.go b/pkg/notifier/telegram.go
@@ -35,7 +35,7 @@ var (
 	_ Notifier = &telegramBot{}
 )
 
-func NewTelegramBot(name string, generalCfg *config.NotifierConfig, cfg *config.TelegramBotConfig) (*telegramBot, error) {
+func NewTelegramBot(name string, cfg *config.TelegramBotConfig) (*telegramBot, error) {
 	botApi, err := tgbotapi.NewBotAPI(utils.Format(cfg.Token, nil, nil))
 	if err != nil {
 		return nil, err

diff --git a/pkg/processor/processor.go b/pkg/processor/processor.go
@@ -103,7 +103,7 @@ func CreateProcessor(item *config.Item, refMap config.RefMap, logger logger.Logg
 
 	if item.NotifierConfig != nil {
 		if item.NotifierConfig.TelegramBot != nil {
-			tgBot, errBot := notifier.NewTelegramBot(item.Name, item.NotifierConfig, item.NotifierConfig.TelegramBot)
+			tgBot, errBot := notifier.NewTelegramBot(item.Name, item.NotifierConfig.TelegramBot)
 			if errBot != nil {
 				logger.Infow("cant setup telegram bot notifier", "error", errBot.Error())
 			} else {