mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-27 05:55:21 +08:00 
			
		
		
		
	Make Gitea 1.22 could be compiled with Go 1.24 (#33643)
In case some users are still using Gitea 1.22
This commit is contained in:
		
							parent
							
								
									2d7a0e3a8b
								
							
						
					
					
						commit
						c0b55670dc
					
				| @ -1,19 +0,0 @@ | ||||
| // Copyright 2022 The Gitea Authors. All rights reserved.
 | ||||
| // SPDX-License-Identifier: MIT
 | ||||
| 
 | ||||
| package log | ||||
| 
 | ||||
| import "unsafe" | ||||
| 
 | ||||
| //go:linkname runtime_getProfLabel runtime/pprof.runtime_getProfLabel
 | ||||
| func runtime_getProfLabel() unsafe.Pointer //nolint
 | ||||
| 
 | ||||
| type labelMap map[string]string | ||||
| 
 | ||||
| func getGoroutineLabels() map[string]string { | ||||
| 	l := (*labelMap)(runtime_getProfLabel()) | ||||
| 	if l == nil { | ||||
| 		return nil | ||||
| 	} | ||||
| 	return *l | ||||
| } | ||||
| @ -1,33 +0,0 @@ | ||||
| // Copyright 2022 The Gitea Authors. All rights reserved.
 | ||||
| // SPDX-License-Identifier: MIT
 | ||||
| 
 | ||||
| package log | ||||
| 
 | ||||
| import ( | ||||
| 	"context" | ||||
| 	"runtime/pprof" | ||||
| 	"testing" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
| 
 | ||||
| func Test_getGoroutineLabels(t *testing.T) { | ||||
| 	pprof.Do(context.Background(), pprof.Labels(), func(ctx context.Context) { | ||||
| 		currentLabels := getGoroutineLabels() | ||||
| 		pprof.ForLabels(ctx, func(key, value string) bool { | ||||
| 			assert.EqualValues(t, value, currentLabels[key]) | ||||
| 			return true | ||||
| 		}) | ||||
| 
 | ||||
| 		pprof.Do(ctx, pprof.Labels("Test_getGoroutineLabels", "Test_getGoroutineLabels_child1"), func(ctx context.Context) { | ||||
| 			currentLabels := getGoroutineLabels() | ||||
| 			pprof.ForLabels(ctx, func(key, value string) bool { | ||||
| 				assert.EqualValues(t, value, currentLabels[key]) | ||||
| 				return true | ||||
| 			}) | ||||
| 			if assert.NotNil(t, currentLabels) { | ||||
| 				assert.EqualValues(t, "Test_getGoroutineLabels_child1", currentLabels["Test_getGoroutineLabels"]) | ||||
| 			} | ||||
| 		}) | ||||
| 	}) | ||||
| } | ||||
| @ -200,10 +200,7 @@ func (l *LoggerImpl) Log(skip int, level Level, format string, logArgs ...any) { | ||||
| 		event.Stacktrace = Stack(skip + 1) | ||||
| 	} | ||||
| 
 | ||||
| 	labels := getGoroutineLabels() | ||||
| 	if labels != nil { | ||||
| 		event.GoroutinePid = labels["pid"] | ||||
| 	} | ||||
| 	event.GoroutinePid = "no-gopid" | ||||
| 
 | ||||
| 	// get a simple text message without color
 | ||||
| 	msgArgs := make([]any, len(logArgs)) | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 wxiaoguang
						wxiaoguang