Merge pull request #825 from projectdiscovery/fix_lib_log_config_issue

fix lib log config issue
projectdiscovery · Mar 26, 2024 · cf9142b · cf9142b
2 parents 01b708d + 7c42305
commit cf9142b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/internal/runner/options.go b/internal/runner/options.go
@@ -9,12 +9,10 @@ import (
 
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/gologger/formatter"
-	"github.com/projectdiscovery/gologger/levels"
 	"github.com/projectdiscovery/katana/pkg/types"
 	"github.com/projectdiscovery/katana/pkg/utils"
 	errorutil "github.com/projectdiscovery/utils/errors"
 	fileutil "github.com/projectdiscovery/utils/file"
-	logutil "github.com/projectdiscovery/utils/log"
 	"gopkg.in/yaml.v3"
 )
 
@@ -110,21 +108,6 @@ func normalizeInput(value string) string {
 	return strings.TrimSpace(value)
 }
 
-// configureOutput configures the output logging levels to be displayed on the screen
-func configureOutput(options *types.Options) {
-	if options.Silent {
-		gologger.DefaultLogger.SetMaxLevel(levels.LevelSilent)
-	} else if options.Verbose {
-		gologger.DefaultLogger.SetMaxLevel(levels.LevelWarning)
-	} else if options.Debug {
-		gologger.DefaultLogger.SetMaxLevel(levels.LevelDebug)
-	} else {
-		gologger.DefaultLogger.SetMaxLevel(levels.LevelInfo)
-	}
-
-	logutil.DisableDefaultLogger()
-}
-
 func initExampleFormFillConfig() error {
 	homedir, err := os.UserHomeDir()
 	if err != nil {

diff --git a/internal/runner/runner.go b/internal/runner/runner.go
@@ -57,7 +57,6 @@ func New(options *types.Options) (*Runner, error) {
 		options.URLs = mapsutil.GetKeys(runnerState.InFlightUrls.GetAll())
 	}
 
-	configureOutput(options)
 	showBanner()
 
 	if options.Version {

diff --git a/pkg/types/crawler_options.go b/pkg/types/crawler_options.go
@@ -6,12 +6,15 @@ import (
 	"time"
 
 	"github.com/projectdiscovery/fastdialer/fastdialer"
+	"github.com/projectdiscovery/gologger"
+	"github.com/projectdiscovery/gologger/levels"
 	"github.com/projectdiscovery/katana/pkg/output"
 	"github.com/projectdiscovery/katana/pkg/utils/extensions"
 	"github.com/projectdiscovery/katana/pkg/utils/filters"
 	"github.com/projectdiscovery/katana/pkg/utils/scope"
 	"github.com/projectdiscovery/ratelimit"
 	errorutil "github.com/projectdiscovery/utils/errors"
+	logutil "github.com/projectdiscovery/utils/log"
 	urlutil "github.com/projectdiscovery/utils/url"
 	wappalyzer "github.com/projectdiscovery/wappalyzergo"
 )
@@ -39,6 +42,7 @@ type CrawlerOptions struct {
 // NewCrawlerOptions creates a new crawler options structure
 // from user specified options.
 func NewCrawlerOptions(options *Options) (*CrawlerOptions, error) {
+	configureOutput(options)
 	extensionsValidator := extensions.NewValidator(options.ExtensionsMatch, options.ExtensionFilter)
 
 	dialerOpts := fastdialer.DefaultOptions
@@ -147,3 +151,18 @@ func (c *CrawlerOptions) ValidateScope(absURL, rootHostname string) (bool, error
 	}
 	return true, nil
 }
+
+// configureOutput configures the output logging levels to be displayed on the screen
+func configureOutput(options *Options) {
+	if options.Silent {
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelSilent)
+	} else if options.Verbose {
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelWarning)
+	} else if options.Debug {
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelDebug)
+	} else {
+		gologger.DefaultLogger.SetMaxLevel(levels.LevelInfo)
+	}
+
+	logutil.DisableDefaultLogger()
+}