Pārlūkot izejas kodu

Simplify function parameters

Rod Hynes 9 gadi atpakaļ
vecāks
revīzija
2b7b5e6471
2 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 1 1
      psiphon/server/api.go
  2. 2 2
      psiphon/server/log.go

+ 1 - 1
psiphon/server/api.go

@@ -98,7 +98,7 @@ func dispatchAPIRequestHandler(
 	// terminating in the case of a bug.
 	// terminating in the case of a bug.
 	defer func() {
 	defer func() {
 		if e := recover(); e != nil {
 		if e := recover(); e != nil {
-			log.LogPanicRecover(e, string(debug.Stack()))
+			log.LogPanicRecover(e, debug.Stack())
 			reterr = common.ContextError(errors.New("request handler panic"))
 			reterr = common.ContextError(errors.New("request handler panic"))
 		}
 		}
 	}()
 	}()

+ 2 - 2
psiphon/server/log.go

@@ -100,12 +100,12 @@ func (logger *ContextLogger) LogRawFieldsWithTimestamp(fields LogFields) {
 
 
 // LogPanicRecover calls LogRawFieldsWithTimestamp with standard fields
 // LogPanicRecover calls LogRawFieldsWithTimestamp with standard fields
 // for logging recovered panics.
 // for logging recovered panics.
-func (logger *ContextLogger) LogPanicRecover(recoverValue interface{}, stack string) {
+func (logger *ContextLogger) LogPanicRecover(recoverValue interface{}, stack []byte) {
 	log.LogRawFieldsWithTimestamp(
 	log.LogRawFieldsWithTimestamp(
 		LogFields{
 		LogFields{
 			"event_name":    "panic",
 			"event_name":    "panic",
 			"recover_value": recoverValue,
 			"recover_value": recoverValue,
-			"stack":         stack,
+			"stack":         string(stack),
 		})
 		})
 }
 }