8000 V0.4 by tkuchiki · Pull Request #9 · tkuchiki/alp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

V0.4 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
8000
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
.idea
pkg/
src/
tmp/
alp
cli/alp/*
!cli/alp/main.go
vendor
76 changes: 76 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentatio 47D8 n.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true

[prune]
go-tests = true
unused-packages = true
231 changes: 231 additions & 0 deletions alp.go
F438
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
package alp

import (
"fmt"
"io"
"os"

"github.com/tkuchiki/alp/flag"
"github.com/tkuchiki/gohttpstats"
"github.com/tkuchiki/gohttpstats/options"
"github.com/tkuchiki/gohttpstats/parsers"
"gopkg.in/alecthomas/kingpin.v2"
)

const version = "0.4.0"

type Profiler struct {
outWriter io.Writer
errWriter io.Writer
inReader *os.File
optionParser *kingpin.Application
flags *flag.Flags
}

func NewProfiler(outw, errw io.Writer) *Profiler {
p := &Profiler{
outWriter: outw,
errWriter: errw,
inReader: os.Stdin,
optionParser: kingpin.New("alp", "Access Log Profiler for LTSV (read from file or stdin)."),
}
p.flags = flag.NewFlags()

p.flags.InitFlags(p.optionParser)

return p
}

func (p *Profiler) SetFlags(flags *flag.Flags) {
p.flags = flags
}

func (p *Profiler) SetInReader(f *os.File) {
p.inReader = f
}

func (p *Profiler) Open(filename string) (*os.File, error) {
var f *os.File
var err error

if filename != "" {
f, err = os.Open(filename)
} else {
f = p.inReader
}

return f, err
}

func (p *Profiler) Run() error {
p.optionParser.Version(version)
p.optionParser.Parse(os.Args[1:])

var sort string
if p.flags.Max {
sort = httpstats.SortMaxResponseTime
} else if p.flags.Min {
sort = httpstats.SortMinResponseTime
} else if p.flags.Avg {
sort = httpstats.SortAvgResponseTime
} else if p.flags.Sum {
sort = httpstats.SortSumResponseTime
} else if p.flags.Cnt {
sort = httpstats.SortCount
} else if p.flags.P1 {
sort = httpstats.SortP1ResponseTime
} else if p.flags.P50 {
sort = httpstats.SortP50ResponseTime
} else if p.flags.P99 {
sort = httpstats.SortP99ResponseTime
} else if p.flags.Stddev {
sort = httpstats.SortStddevResponseTime
} else if p.flags.SortUri {
sort = httpstats.SortUri
} else if p.flags.Method {
sort = httpstats.SortMethod
} else if p.flags.MaxBody {
sort = httpstats.SortMaxResponseBodySize
} else if p.flags.MinBody {
sort = httpstats.SortMinResponseBodySize
} else if p.flags.AvgBody {
sort = httpstats.SortAvgResponseBodySize
} else if p.flags.SumBody {
sort = httpstats.SortSumResponseBodySize
} else {
sort = httpstats.SortMaxResponseTime
}

var err error
var options *stats_options.Options
if p.flags.Config != "" {
cf, err := os.Open(p.flags.Config)
if err != nil {
return err
}
defer cf.Close()

options, err = stats_options.LoadOptionsFromReader(cf)
if err != nil {
return err
}
} else {
options = stats_options.NewOptions()
}

options = stats_options.SetOptions(options,
stats_options.File(p.flags.File),
stats_options.Sort(sort),
stats_options.Reverse(p.flags.Reverse),
stats_options.QueryString(p.flags.QueryString),
stats_options.Tsv(p.flags.Tsv),
stats_options.ApptimeLabel(p.flags.ApptimeLabel),
stats_options.ReqtimeLabel(p.flags.ReqtimeLabel),
stats_options.StatusLabel(p.flags.StatusLabel),
stats_options.SizeLabel(p.flags.SizeLabel),
stats_options.MethodLabel(p.flags.MethodLabel),
stats_options.UriLabel(p.flags.UriLabel),
stats_options.TimeLabel(p.flags.TimeLabel),
stats_options.Limit(p.flags.Limit),
stats_options.NoHeaders(p.flags.NoHeaders),
stats_options.StartTime(p.flags.StartTime),
stats_options.EndTime(p.flags.EndTime),
stats_options.StartTimeDuration(p.flags.StartTimeDuration),
stats_options.EndTimeDuration(p.flags.EndTimeDuration),
stats_options.CSVIncludes(p.flags.Includes),
stats_options.CSVExcludes(p.flags.Excludes),
stats_options.CSVIncludeStatuses(p.flags.IncludeStatuses),
stats_options.CSVExcludeStatuses(p.flags.ExcludeStatuses),
stats_options.CSVAggregates(p.flags.Aggregates),
)

po := httpstats.NewPrintOptions()
po.SetWriter(p.outWriter)
if options.Tsv {
po.SetFormat("tsv")
}
stats := httpstats.NewHTTPStats(true, false, false, po)

err = stats.InitFilter(options)
if err != nil {
return err
}

stats.SetOptions(options)

if p.flags.Load != "" {
lf, err := os.Open(p.flags.Load)
if err != nil {
return err
}
err = stats.LoadStats(lf)
if err != nil {
return err
}
defer lf.Close()

stats.SortWithOptions()
stats.Print()
return nil
}

f, err := p.Open(options.File)
if err != nil {
return err
}
defer f.Close()

if len(options.Aggregates) > 0 {
err = stats.SetURICapturingGroups(options.Aggregates)
if err != nil {
return err
}
}

label := parsers.NewLTSVLabel(options.UriLabel, options.ApptimeLabel, options.ReqtimeLabel,
options.SizeLabel, options.StatusLabel, options.MethodLabel, options.TimeLabel,
)

parser := parsers.NewLTSVParser(f, label, options.QueryString)
if err != nil {
return err
}

Loop:
for {
s, err := parser.Parse()
if err != nil {
if err == io.EOF {
break
} else if err == httpstats.SkipReadLineErr {
continue Loop
}

return err
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

まずはerrorがnilかどうかをチェックしてから他のエラーをチェックしたほうがよいかと

if err != nil {
  if err == io.EOF {
    break
  } else if err == httpstas.SkipReadLineErr {
    continue Loop
  }

  return err
}

(とはいえ好みの部分もあると思います)

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

私もこの書き方のほうが好みなので修正します


if !stats.DoFilter(s.Uri, s.Method, s.Time) {
continue Loop
}

stats.Set(s.Uri, s.Method, s.Status, s.ResponseTime, s.BodySize, 0)

if stats.CountUris() > options.Limit {
return fmt.Errorf("Too many URI's (%d or less)", options.Limit)
}
}

if p.flags.Dump != "" {
df, err := os.OpenFile(p.flags.Dump, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
err = stats.DumpStats(df)
if err != nil {
return err
}
defer df.Close()
}

stats.SortWithOptions()
stats.Print()

return nil
}
Loading
0