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

Add "server_" prefix to all psiphond log event names

Rod Hynes 7 éve
szülő
commit
3be919c08b
3 módosított fájl, 7 hozzáadás és 4 törlés
  1. 1 1
      Server/main.go
  2. 5 2
      psiphon/common/tun/tun.go
  3. 1 1
      psiphon/common/tun/tun_test.go

+ 1 - 1
Server/main.go

@@ -286,7 +286,7 @@ func panicHandler(output string) {
 		logEvent["host_id"] = config.HostID
 		logEvent["build_rev"] = common.GetBuildInfo().BuildRev
 		logEvent["timestamp"] = time.Now().Format(time.RFC3339)
-		logEvent["event_name"] = "panic"
+		logEvent["event_name"] = "server_panic"
 		logEvent["panic"] = output
 
 		// Logs are written to the configured file name. If no name is specified, logs are written to stderr

+ 5 - 2
psiphon/common/tun/tun.go

@@ -600,7 +600,7 @@ func (server *Server) interruptSession(session *session) {
 		session.metrics.checkpoint(
 			server.config.Logger,
 			metricsUpdater,
-			"packet_metrics",
+			"server_packet_metrics",
 			packetMetricsAll)
 	}
 
@@ -693,7 +693,10 @@ func (server *Server) runOrphanMetricsCheckpointer() {
 
 		// TODO: skip log if all zeros?
 		server.orphanMetrics.checkpoint(
-			server.config.Logger, nil, "orphan_packet_metrics", packetMetricsRejected)
+			server.config.Logger,
+			nil,
+			"server_orphan_packet_metrics",
+			packetMetricsRejected)
 		if done {
 			return
 		}

+ 1 - 1
psiphon/common/tun/tun_test.go

@@ -709,7 +709,7 @@ func (logger *testLogger) LogMetric(metric string, fields common.LogFields) {
 
 	fmt.Printf("METRIC: %s: %+v\n", metric, fields)
 
-	if metric == "packet_metrics" && logger.packetMetrics != nil {
+	if metric == "server_packet_metrics" && logger.packetMetrics != nil {
 		select {
 		case logger.packetMetrics <- fields:
 		default: