Browse Source

Fix: don't double JSON encode tunnel duration items

Rod Hynes 10 years ago
parent
commit
6ee698c6c7
1 changed files with 6 additions and 1 deletions
  1. 6 1
      psiphon/serverApi.go

+ 6 - 1
psiphon/serverApi.go

@@ -332,7 +332,12 @@ func makeStatusRequestPayload(
 	payload["page_views"] = make([]string, 0)
 	payload["page_views"] = make([]string, 0)
 	payload["https_requests"] = make([]string, 0)
 	payload["https_requests"] = make([]string, 0)
 
 
-	payload["tunnel_durations"] = tunnelDurations
+	// Tunnel duration records are already in JSON format
+	jsonTunnelDurations := make([]json.RawMessage, len(tunnelDurations))
+	for i, tunnelDuration := range tunnelDurations {
+		jsonTunnelDurations[i] = json.RawMessage(tunnelDuration)
+	}
+	payload["tunnel_durations"] = jsonTunnelDurations
 
 
 	jsonPayload, err := json.Marshal(payload)
 	jsonPayload, err := json.Marshal(payload)
 	if err != nil {
 	if err != nil {