Skip to content

Commit 2f619ac

Browse files
committed
refactor(scanner): Move logging into the scan() function
Generalize the wording of the log messages so they can be consolidated in the `scan()` function. Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 9da44a3 commit 2f619ac

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

scanner/src/main/kotlin/Scanner.kt

+6-9
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ class Scanner(
115115
val projectResults = if (projectScannerWrappers.isNotEmpty()) {
116116
val packages = ortResult.getProjects(skipExcluded).mapTo(mutableSetOf()) { it.toPackage() }
117117

118-
logger.info { "Scanning ${packages.size} project(s) with ${projectScannerWrappers.size} scanner(s)." }
119-
120118
scan(
121119
packages,
122120
ScanContext(
@@ -127,17 +125,13 @@ class Scanner(
127125
)
128126
)
129127
} else {
130-
logger.info { "Skipping project scan as no project scanner is configured." }
131-
132128
ScannerRun.EMPTY
133129
}
134130

135131
val packageResults = if (packageScannerWrappers.isNotEmpty()) {
136132
val packages = ortResult.getPackages(skipExcluded).map { it.metadata }.filterNotConcluded()
137133
.filterNotMetadataOnly().toSet()
138134

139-
logger.info { "Scanning ${packages.size} package(s) with ${packageScannerWrappers.size} scanner(s)." }
140-
141135
scan(
142136
packages,
143137
ScanContext(
@@ -148,8 +142,6 @@ class Scanner(
148142
)
149143
)
150144
} else {
151-
logger.info { "Skipping package scan as no package scanner is configured." }
152-
153145
ScannerRun.EMPTY
154146
}
155147

@@ -171,7 +163,12 @@ class Scanner(
171163

172164
suspend fun scan(packages: Set<Package>, context: ScanContext): ScannerRun {
173165
val scannerWrappers = scannerWrappers[context.packageType]
174-
if (scannerWrappers.isNullOrEmpty()) return ScannerRun.EMPTY
166+
if (scannerWrappers.isNullOrEmpty()) {
167+
logger.info { "Skipping ${context.packageType} scan as no according scanner is configured." }
168+
return ScannerRun.EMPTY
169+
}
170+
171+
logger.info { "Scanning ${packages.size} ${context.packageType}(s) with ${scannerWrappers.size} scanner(s)." }
175172

176173
val controller = ScanController(packages, scannerWrappers, scannerConfig)
177174

0 commit comments

Comments
 (0)