Skip to content

Commit 24d98ee

Browse files
authored
Merge pull request github#17741 from github/igfoo/logverb
Kotlin: Log our verbosity level
2 parents 1626af0 + 9f34027 commit 24d98ee

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ class KotlinExtractorExtension(
140140
val logger = Logger(loggerBase, tw)
141141
logger.info("Extraction started")
142142
logger.flush()
143+
logger.infoVerbosity()
143144
logger.info("Extraction for invocation TRAP file $invocationTrapFile")
144145
logger.flush()
145146
logger.info("Kotlin version ${KotlinCompilerVersion.getVersion()}")

java/kotlin-extractor/src/main/kotlin/utils/Logger.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,10 @@ open class LoggerBase(val logCounter: LogCounter) {
244244
}
245245
}
246246

247+
fun infoVerbosity(dtw: DiagnosticTrapWriter) {
248+
info(dtw, "Kotlin extractor verbosity is " + verbosity.toString())
249+
}
250+
247251
fun warn(dtw: DiagnosticTrapWriter, msg: String, extraInfo: String?) {
248252
if (verbosity >= 2) {
249253
diagnostic(dtw, Severity.Warn, msg, extraInfo)
@@ -301,6 +305,10 @@ open class Logger(val loggerBase: LoggerBase, val dtw: DiagnosticTrapWriter) {
301305
loggerBase.info(dtw, msg)
302306
}
303307

308+
fun infoVerbosity() {
309+
loggerBase.infoVerbosity(dtw)
310+
}
311+
304312
private fun warn(msg: String, extraInfo: String?) {
305313
loggerBase.warn(dtw, msg, extraInfo)
306314
}

java/ql/integration-tests/kotlin/all-platforms/logs/logs.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Log file 1
22
{"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Extraction started"}
3+
{"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Kotlin extractor verbosity is 3"}
34
{"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Extraction for invocation TRAP file <FILENAME>"}
45
{"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Kotlin version <VERSION>"}
56
{"origin": "CodeQL Kotlin extractor", "kind": "INFO", "message": "Extracting file test.kt"}

0 commit comments

Comments
 (0)