fix(slack): Limit log for blocks

traPtitech · Jul 5, 2024 · 09a9e93 · 09a9e93
1 parent 1077b25
commit 09a9e93
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/pkg/bot/command.go b/pkg/bot/command.go
@@ -221,7 +221,7 @@ func (c *CommandInstance) Execute(ctx domain.Context) error {
 	cmd.Stdout = &buf
 	cmd.Stderr = &buf
 
-	const logLimit = 9900
+	logLimit := ctx.MessageLimit() - 100 /* margin */
 
 	err := cmd.Run()
 	if err != nil {

diff --git a/pkg/bot/slack/context.go b/pkg/bot/slack/context.go
@@ -42,6 +42,11 @@ func (ctx *slackContext) L() *zap.Logger {
 	)
 }
 
+func (ctx *slackContext) MessageLimit() int {
+	// https://stackoverflow.com/questions/60344831/slack-api-invalid-block
+	return 2500
+}
+
 func (ctx *slackContext) sendSlackMessage(channelID string, text string) error {
 	api := ctx.api
 	return utils.WithRetry(ctx, 10, func(ctx context.Context) error {

diff --git a/pkg/bot/traq/context.go b/pkg/bot/traq/context.go
@@ -45,6 +45,10 @@ func (ctx *traqContext) L() *zap.Logger {
 	)
 }
 
+func (ctx *traqContext) MessageLimit() int {
+	return 9900
+}
+
 // sendTRAQMessage traQにメッセージ送信
 func (ctx *traqContext) sendTRAQMessage(channelID string, text string) error {
 	api := ctx.api

diff --git a/pkg/domain/bot.go b/pkg/domain/bot.go
@@ -23,6 +23,7 @@ type Context interface {
 
 	// L returns logger.
 	L() *zap.Logger
+	MessageLimit() int
 
 	// ReplyBad コマンドメッセージにBadスタンプをつけて返信します
 	ReplyBad(message ...string) error