2018-03-31 08:30:12 +00:00
|
|
|
package command
|
|
|
|
|
2021-02-16 20:31:50 +00:00
|
|
|
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
|
2018-03-31 08:30:12 +00:00
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2019-07-08 06:12:17 +00:00
|
|
|
"runtime"
|
|
|
|
"time"
|
2018-03-31 08:30:12 +00:00
|
|
|
|
2021-02-17 00:07:12 +00:00
|
|
|
"google.golang.org/grpc"
|
2018-07-10 21:40:58 +00:00
|
|
|
|
2021-02-16 20:31:50 +00:00
|
|
|
core "github.com/v2fly/v2ray-core/v4"
|
|
|
|
"github.com/v2fly/v2ray-core/v4/app/stats"
|
|
|
|
"github.com/v2fly/v2ray-core/v4/common"
|
|
|
|
"github.com/v2fly/v2ray-core/v4/common/strmatcher"
|
|
|
|
feature_stats "github.com/v2fly/v2ray-core/v4/features/stats"
|
2018-03-31 08:30:12 +00:00
|
|
|
)
|
|
|
|
|
2018-07-10 21:40:58 +00:00
|
|
|
// statsServer is an implementation of StatsService.
|
2018-03-31 08:30:12 +00:00
|
|
|
type statsServer struct {
|
2019-07-08 06:12:17 +00:00
|
|
|
stats feature_stats.Manager
|
|
|
|
startTime time.Time
|
2018-03-31 08:30:12 +00:00
|
|
|
}
|
|
|
|
|
2018-10-11 19:14:53 +00:00
|
|
|
func NewStatsServer(manager feature_stats.Manager) StatsServiceServer {
|
2019-07-08 06:12:17 +00:00
|
|
|
return &statsServer{
|
|
|
|
stats: manager,
|
|
|
|
startTime: time.Now(),
|
|
|
|
}
|
2018-07-10 21:40:58 +00:00
|
|
|
}
|
|
|
|
|
2018-03-31 08:30:12 +00:00
|
|
|
func (s *statsServer) GetStats(ctx context.Context, request *GetStatsRequest) (*GetStatsResponse, error) {
|
|
|
|
c := s.stats.GetCounter(request.Name)
|
|
|
|
if c == nil {
|
|
|
|
return nil, newError(request.Name, " not found.")
|
|
|
|
}
|
|
|
|
var value int64
|
|
|
|
if request.Reset_ {
|
|
|
|
value = c.Set(0)
|
|
|
|
} else {
|
|
|
|
value = c.Value()
|
|
|
|
}
|
|
|
|
return &GetStatsResponse{
|
|
|
|
Stat: &Stat{
|
|
|
|
Name: request.Name,
|
|
|
|
Value: value,
|
|
|
|
},
|
|
|
|
}, nil
|
|
|
|
}
|
|
|
|
|
2018-07-10 21:40:58 +00:00
|
|
|
func (s *statsServer) QueryStats(ctx context.Context, request *QueryStatsRequest) (*QueryStatsResponse, error) {
|
improve commands (#648)
* stat show json refactor
> will show {} since scripts should expect it, its the json style of blank value
* combine statistics commands to one
* code optimize
* fix runtime flag
* remove json indent
* change overridden to override
* api bi -json
* convert stdin support
code optimize
* writeRow() code optimize
add stats tittle
revert back to restartlogger
* api log -restart
* follow log
* codeql
* move -json to shared flags
* flags optimize
* update flag descriptions
* change "-v" of "api bo" to duration
* change "-expire" of "tls cert" to days
* cmds short description optimize
* fix multiple log followers
* Format loader refactor
* "infra/conf/merge" refactor
* "LoadConfig" refactor
* add "infra/conf/mergers"
* contribute to it will benifit `v2ray run`,`v2ray test`,`v2ray convert`
* easily add new formats, by just adding a converter like json.FromTOML
* default format auto, to all cmds above
* auto detect input format
* mixed formats support
* better stdin behavior
* don't wait if no content
* don't use 'stdin:' placeholder
* `v2ray test` now behaves exactly the same with `v2ray run`, including stdin reading
* api ado, adi, rmo, rmi refactor
* support folders to files resolving, mixed formats
* remove remaining 'stdin:' placeholders
* fix tests
* os.Stdin.Stat() behaves different in platforms, removed
* code optimize
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
2021-02-21 15:02:42 +00:00
|
|
|
mgroup := &strmatcher.MatcherGroup{}
|
|
|
|
if request.Pattern != "" {
|
|
|
|
request.Patterns = append(request.Patterns, request.Pattern)
|
|
|
|
}
|
|
|
|
t := strmatcher.Substr
|
|
|
|
if request.Regexp {
|
|
|
|
t = strmatcher.Regex
|
|
|
|
}
|
|
|
|
for _, p := range request.Patterns {
|
|
|
|
m, err := t.New(p)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
mgroup.Add(m)
|
2018-07-10 21:40:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
response := &QueryStatsResponse{}
|
|
|
|
|
|
|
|
manager, ok := s.stats.(*stats.Manager)
|
|
|
|
if !ok {
|
|
|
|
return nil, newError("QueryStats only works its own stats.Manager.")
|
|
|
|
}
|
|
|
|
|
2020-09-04 07:07:42 +00:00
|
|
|
manager.VisitCounters(func(name string, c feature_stats.Counter) bool {
|
improve commands (#648)
* stat show json refactor
> will show {} since scripts should expect it, its the json style of blank value
* combine statistics commands to one
* code optimize
* fix runtime flag
* remove json indent
* change overridden to override
* api bi -json
* convert stdin support
code optimize
* writeRow() code optimize
add stats tittle
revert back to restartlogger
* api log -restart
* follow log
* codeql
* move -json to shared flags
* flags optimize
* update flag descriptions
* change "-v" of "api bo" to duration
* change "-expire" of "tls cert" to days
* cmds short description optimize
* fix multiple log followers
* Format loader refactor
* "infra/conf/merge" refactor
* "LoadConfig" refactor
* add "infra/conf/mergers"
* contribute to it will benifit `v2ray run`,`v2ray test`,`v2ray convert`
* easily add new formats, by just adding a converter like json.FromTOML
* default format auto, to all cmds above
* auto detect input format
* mixed formats support
* better stdin behavior
* don't wait if no content
* don't use 'stdin:' placeholder
* `v2ray test` now behaves exactly the same with `v2ray run`, including stdin reading
* api ado, adi, rmo, rmi refactor
* support folders to files resolving, mixed formats
* remove remaining 'stdin:' placeholders
* fix tests
* os.Stdin.Stat() behaves different in platforms, removed
* code optimize
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
2021-02-21 15:02:42 +00:00
|
|
|
if mgroup.Size() == 0 || len(mgroup.Match(name)) > 0 {
|
2018-07-10 21:40:58 +00:00
|
|
|
var value int64
|
|
|
|
if request.Reset_ {
|
|
|
|
value = c.Set(0)
|
|
|
|
} else {
|
|
|
|
value = c.Value()
|
|
|
|
}
|
|
|
|
response.Stat = append(response.Stat, &Stat{
|
|
|
|
Name: name,
|
|
|
|
Value: value,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
})
|
|
|
|
|
|
|
|
return response, nil
|
|
|
|
}
|
|
|
|
|
2019-07-08 06:12:17 +00:00
|
|
|
func (s *statsServer) GetSysStats(ctx context.Context, request *SysStatsRequest) (*SysStatsResponse, error) {
|
|
|
|
var rtm runtime.MemStats
|
|
|
|
runtime.ReadMemStats(&rtm)
|
|
|
|
|
|
|
|
uptime := time.Since(s.startTime)
|
|
|
|
|
|
|
|
response := &SysStatsResponse{
|
|
|
|
Uptime: uint32(uptime.Seconds()),
|
|
|
|
NumGoroutine: uint32(runtime.NumGoroutine()),
|
|
|
|
Alloc: rtm.Alloc,
|
|
|
|
TotalAlloc: rtm.TotalAlloc,
|
|
|
|
Sys: rtm.Sys,
|
|
|
|
Mallocs: rtm.Mallocs,
|
|
|
|
Frees: rtm.Frees,
|
|
|
|
LiveObjects: rtm.Mallocs - rtm.Frees,
|
|
|
|
NumGC: rtm.NumGC,
|
|
|
|
PauseTotalNs: rtm.PauseTotalNs,
|
|
|
|
}
|
|
|
|
|
|
|
|
return response, nil
|
|
|
|
}
|
|
|
|
|
2020-08-24 12:10:26 +00:00
|
|
|
func (s *statsServer) mustEmbedUnimplementedStatsServiceServer() {}
|
|
|
|
|
2018-03-31 08:30:12 +00:00
|
|
|
type service struct {
|
2018-10-22 09:26:22 +00:00
|
|
|
statsManager feature_stats.Manager
|
2018-03-31 08:30:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s *service) Register(server *grpc.Server) {
|
2018-10-22 09:26:22 +00:00
|
|
|
RegisterStatsServiceServer(server, NewStatsServer(s.statsManager))
|
2018-03-31 08:30:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func init() {
|
|
|
|
common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, cfg interface{}) (interface{}, error) {
|
2018-10-22 09:26:22 +00:00
|
|
|
s := new(service)
|
|
|
|
|
|
|
|
core.RequireFeatures(ctx, func(sm feature_stats.Manager) {
|
|
|
|
s.statsManager = sm
|
|
|
|
})
|
|
|
|
|
|
|
|
return s, nil
|
2018-03-31 08:30:12 +00:00
|
|
|
}))
|
|
|
|
}
|