Merge pull request #404 from isucon/fix/truncate-msg

ベンチのログを切り詰め + 不要ログ削除
isucon · Nov 24, 2023 · 57c335d · 57c335d
2 parents c0aeb78 + f735834
commit 57c335d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/bench/cmd/bench/benchmarker.go b/bench/cmd/bench/benchmarker.go
@@ -100,7 +100,8 @@ func powWeightSize(m int) int64 {
 
 func newBenchmarker(ctx context.Context, contestantLogger *zap.Logger) *benchmarker {
 	var weight int64 = int64(config.BaseParallelism)
-	contestantLogger.Info("負荷レベル", zap.Int64("level", weight))
+	// いま負荷レベルは固定値なので選手に見せる意味がない
+	// contestantLogger.Info("負荷レベル", zap.Int64("level", weight))
 
 	longStreamerClientPool := isupipe.NewClientPool(ctx)
 	streamerClientPool := isupipe.NewClientPool(ctx)

diff --git a/bench/cmd/bench/supervise.go b/bench/cmd/bench/supervise.go
@@ -98,11 +98,12 @@ func fetchAZName(ctx context.Context) (string, error) {
 	return azName, nil
 }
 
+// messagesの末尾からn行を結合して取得
 func joinN(messages []string, n int) string {
-	if len(messages) > n {
-		return strings.Join(messages[:n], ",\n")
+	if len(messages) <= n {
+		return strings.Join(messages, "\n")
 	}
-	return strings.Join(messages, ",\n")
+	return strings.Join(messages[len(messages)-n:], "\n")
 }
 
 func execBench(ctx context.Context, job *Job) (*Result, error) {
@@ -280,7 +281,7 @@ var supervise = cli.Command{
 		},
 		cli.IntFlag{
 			Name:        "message-limit",
-			Value:       2000,
+			Value:       200,
 			Destination: &messageLimit,
 			EnvVar:      "SUPERVISOR_MESSAGE_LIMIT",
 		},