Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(logging): add -log-to-file and don't output to file by default (#1209)

Browse Source 
* feat(logging): add -log-to-file and don't output to file by default

* update go-cve-dict

* fix lint err
This commit is contained in:
Kota Kanbe
2021-04-05 17:41:07 +09:00
committed by GitHub
parent 36c9c229b8
commit 740781af56
16 changed files with 91 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scanner/serverapi.go
View File

@@ -71,6 +71,7 @@ type Scanner struct {
ScanTimeoutSec int
CacheDBPath string
Debug bool
LogToFile bool
LogDir string
Quiet bool
DetectIPS bool
@@ -198,6 +199,7 @@ func ViaHTTP(header http.Header, body string, toLocalFile bool) (models.ScanResu
}, nil
}
// ParseInstalledPkgs parses installed pkgs line
func ParseInstalledPkgs(distro config.Distro, kernel models.Kernel, pkgList string) (models.Packages, models.SrcPackages, error) {
base := base{
Distro: distro,
@@ -212,21 +214,13 @@ func ParseInstalledPkgs(distro config.Distro, kernel models.Kernel, pkgList stri
case constant.Debian, constant.Ubuntu:
osType = &debian{base: base}
case constant.RedHat:
osType = &rhel{
redhatBase: redhatBase{base: base},
}
osType = &rhel{redhatBase: redhatBase{base: base}}
case constant.CentOS:
osType = &centos{
redhatBase: redhatBase{base: base},
}
osType = &centos{redhatBase: redhatBase{base: base}}
case constant.Oracle:
osType = &oracle{
redhatBase: redhatBase{base: base},
}
osType = &oracle{redhatBase: redhatBase{base: base}}
case constant.Amazon:
osType = &amazon{
redhatBase: redhatBase{base: base},
}
osType = &amazon{redhatBase: redhatBase{base: base}}
default:
return models.Packages{}, models.SrcPackages{}, xerrors.Errorf("Server mode for %s is not implemented yet", base.Distro.Family)
}
@@ -244,12 +238,12 @@ func (s Scanner) initServers() error {
// to generate random color for logging
rand.Seed(time.Now().UnixNano())
for _, srv := range hosts {
srv.setLogger(logging.NewCustomLogger(s.Debug, s.Quiet, s.LogDir, config.Colors[rand.Intn(len(config.Colors))], srv.getServerInfo().GetServerName()))
srv.setLogger(logging.NewCustomLogger(s.Debug, s.Quiet, s.LogToFile, s.LogDir, config.Colors[rand.Intn(len(config.Colors))], srv.getServerInfo().GetServerName()))
}
containers, errContainers := s.detectContainerOSes(hosts)
for _, srv := range containers {
srv.setLogger(logging.NewCustomLogger(s.Debug, s.Quiet, s.LogDir, config.Colors[rand.Intn(len(config.Colors))], srv.getServerInfo().GetServerName()))
srv.setLogger(logging.NewCustomLogger(s.Debug, s.Quiet, s.LogToFile, s.LogDir, config.Colors[rand.Intn(len(config.Colors))], srv.getServerInfo().GetServerName()))
}
// set to pkg global variable