use the same io.Writer as the cobra.Commands for writing crawl logs

atomicptr · Apr 4, 2020 · 9e8eaae · 9e8eaae
1 parent 2f33c68
commit 9e8eaae
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/pkg/cli/crawl/cmd.go b/pkg/cli/crawl/cmd.go
@@ -27,7 +27,7 @@ var Command = &cobra.Command{
 		modifier := crawler.RequestModifier{}
 		registerStandardCrawlCommandFlagModifiers(&modifier, crawlCommandFlags)
 
-		err := crawlUrls(args, modifier, crawlCommandFlags)
+		err := crawlUrls(args, modifier, crawlCommandFlags, cmd.OutOrStdout())
 		if err != nil {
 			fmt.Printf("Could not create crawlable URLs:\n\t%s\n", err)
 			os.Exit(1)

diff --git a/pkg/cli/crawl/cmd_list.go b/pkg/cli/crawl/cmd_list.go
@@ -37,7 +37,7 @@ var ListCommand = &cobra.Command{
 			os.Exit(1)
 		}
 
-		err = crawlUrls(urls, modifier, listCommandFlags)
+		err = crawlUrls(urls, modifier, listCommandFlags, cmd.OutOrStdout())
 		if err != nil {
 			fmt.Printf("Could not create crawlable URLs:\n\t%s\n", err)
 			os.Exit(1)

diff --git a/pkg/cli/crawl/cmd_sitemap.go b/pkg/cli/crawl/cmd_sitemap.go
@@ -38,7 +38,7 @@ var SitemapCommand = &cobra.Command{
 			os.Exit(1)
 		}
 
-		err = crawlUrls(urls, modifier, sitemapCommandFlags)
+		err = crawlUrls(urls, modifier, sitemapCommandFlags, cmd.OutOrStdout())
 		if err != nil {
 			fmt.Printf("Could not create crawlable URLs:\n\t%s\n", err)
 			os.Exit(1)

diff --git a/pkg/cli/crawl/commons.go b/pkg/cli/crawl/commons.go
@@ -2,6 +2,7 @@ package crawl
 
 import (
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -71,7 +72,7 @@ func registerStandardCrawlCommandFlagModifiers(modifier *crawler.RequestModifier
 	}
 }
 
-func crawlUrls(urls []string, modifier crawler.RequestModifier, flagOptions crawlerFlagOptions) error {
+func crawlUrls(urls []string, modifier crawler.RequestModifier, flagOptions crawlerFlagOptions, outWriter io.Writer) error {
 	requests, err := crawler.CreateRequestsFromUrls(urls, modifier)
 	if err != nil {
 		return err
@@ -90,6 +91,7 @@ func crawlUrls(urls []string, modifier crawler.RequestModifier, flagOptions craw
 			Timeout: flagOptions.HttpTimeout,
 		},
 		FilterStatusQuery: flagOptions.FilterStatusQuery,
+		OutWriter:         outWriter,
 	}
 	crawl.Crawl(requests)
 

diff --git a/pkg/crawler/crawler.go b/pkg/crawler/crawler.go
@@ -1,6 +1,7 @@
 package crawler
 
 import (
+	"io"
 	"net/http"
 	"sync"
 	"time"
@@ -14,6 +15,7 @@ type Crawler struct {
 	HttpClient        http.Client
 	NumberOfWorkers   int
 	FilterStatusQuery string
+	OutWriter         io.Writer
 	statusFilter      *filter.Filter
 	printMutex        sync.Mutex
 }

diff --git a/pkg/crawler/log.go b/pkg/crawler/log.go
@@ -17,7 +17,7 @@ func (c *Crawler) safePrintln(statusCode int, message string) {
 
 	if c.statusFilter.IsValid(c.FilterStatusQuery, int64(statusCode)) {
 		c.printMutex.Lock()
-		fmt.Println(message)
+		_, _ = fmt.Fprintln(c.OutWriter, message)
 		c.printMutex.Unlock()
 	}
 }