Forráskód Böngészése

Don't repeat identical ApplicationParameter notices

Rod Hynes 3 éve
szülő
commit
20613ebc56
1 módosított fájl, 7 hozzáadás és 2 törlés
  1. 7 2
      psiphon/notice.go

+ 7 - 2
psiphon/notice.go

@@ -945,9 +945,14 @@ func NoticeFragmentor(diagnosticID string, message string) {
 	}
 	}
 }
 }
 
 
+// NoticeApplicationParameters reports application parameters. Each key/value
+// parameter pair is emitted in a distinct notice, and each key/value pair is
+// reported at most once per session for a fixed value.
 func NoticeApplicationParameters(keyValues parameters.KeyValues) {
 func NoticeApplicationParameters(keyValues parameters.KeyValues) {
 	for key, value := range keyValues {
 	for key, value := range keyValues {
-		singletonNoticeLogger.outputNotice(
+		repetitionKey := fmt.Sprintf("ApplicationParameterKey-%s", key)
+		outputRepetitiveNotice(
+			repetitionKey, string(value), 0,
 			"ApplicationParameter", 0,
 			"ApplicationParameter", 0,
 			"key", key,
 			"key", key,
 			"value", value)
 			"value", value)
@@ -1000,7 +1005,7 @@ func NoticeHoldOffTunnel(diagnosticID string, duration time.Duration) {
 // session.
 // session.
 func NoticeSkipServerEntry(format string, args ...interface{}) {
 func NoticeSkipServerEntry(format string, args ...interface{}) {
 	reason := fmt.Sprintf(format, args...)
 	reason := fmt.Sprintf(format, args...)
-	repetitionKey := fmt.Sprintf("ServerAlert-%+v", reason)
+	repetitionKey := fmt.Sprintf("SkipServerEntryReason-%+v", reason)
 	outputRepetitiveNotice(
 	outputRepetitiveNotice(
 		repetitionKey, "", 0,
 		repetitionKey, "", 0,
 		"SkipServerEntry", 0, "reason", reason)
 		"SkipServerEntry", 0, "reason", reason)