github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-04-05 02:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up logging

Browse Source
This commit is contained in:
Bryan Boreham
2018-11-15 18:18:07 +00:00
parent 7143356fd5
commit ab796c7c6f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extras/scanner/main.go
View File

@@ -95,13 +95,17 @@ func main() {
flag.IntVar(&scanner.segments, "segments", 1, "Number of segments to read in parallel")
flag.IntVar(&scanner.deleters, "deleters", 1, "Number of deleters to run in parallel")
flag.IntVar(&scanner.deleteBatchSize, "delete-batch-size", 25, "Number of delete requests to batch up")
flag.StringVar(&scanner.address, "address", "localhost:6060", "Address to listen on, for profiling, etc.")
flag.StringVar(&scanner.address, "address", ":6060", "Address to listen on, for profiling, etc.")
flag.StringVar(&orgsFile, "delete-orgs-file", "", "File containing IDs of orgs to delete")
flag.StringVar(&loglevel, "log-level", "info", "Debug level: debug, info, warning, error")
flag.IntVar(&pagesPerDot, "pages-per-dot", 10, "Print a dot per N pages in DynamoDB (0 to disable)")
flag.Parse()
level, err := log.ParseLevel(loglevel)
checkFatal(err)
log.SetLevel(level)
parsed, err := url.Parse(collectorURL)
checkFatal(err)
s3Address, err := url.Parse(s3URL)
@@ -262,7 +266,7 @@ func (s summary) print() {
func checkFatal(err error) {
if err != nil {
log.Error("msg", "fatal error", "err", err)
log.Errorf("fatal error: %s", err)
os.Exit(1)
}
}
@@ -279,7 +283,7 @@ func (sc *scanner) deleteLoopS3(pending *sync.WaitGroup) {
if !ok {
return
}
log.Debug("msg", "S3 delete", "key", aws.StringValue(item.Key))
log.Debug("S3 delete ", aws.StringValue(item.Key))
err := instrument.TimeRequestHistogram(ctx, "S3.Delete", s3RequestDuration, func(_ context.Context) error {
_, err := sc.s3.DeleteObjectWithContext(ctx, item)
return err
@@ -294,7 +298,7 @@ func (sc *scanner) deleteLoop(pending *sync.WaitGroup) {
if !ok {
return
}
log.Debug("msg", "about to delete", "num_requests", len(batch))
log.Debug("about to delete", len(batch))
ret, err := sc.dynamoDB.BatchWriteItem(&dynamodb.BatchWriteItemInput{
RequestItems: map[string][]*dynamodb.WriteRequest{
sc.tableName: batch,