IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-10 12:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Browse Source 
 Conflicts:
	internal/api/group/group.go
	internal/api/group/super_group.go
	pkg/common/db/controller/user.go
This commit is contained in:
wangchuxiao
2023-02-09 14:49:17 +08:00
parent 414915eb3b 2f7b65730a
commit 1075754458
19 changed files with 1776 additions and 1681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/utils/utils.go
+6 -2
View File
@@ -38,8 +38,12 @@ func GetSelfFuncName() string {
return cleanUpFuncName(runtime.FuncForPC(pc).Name())
}
func GetFuncName(skip int) string {
pc, _, _, _ := runtime.Caller(skip + 1)
func GetFuncName(skips ...int) string {
skip := 1
if len(skips) > 0 {
skip = skips[0] + 1
}
pc, _, _, _ := runtime.Caller(skip)
return cleanUpFuncName(runtime.FuncForPC(pc).Name())
}