mirror of https://github.com/sbt/sbt.git
Instantiate logger earlier, only keep one instance around
The loggers are now supposed to be re-usable (which simplifies their handling)
This commit is contained in:
parent
bc69e0b11a
commit
1390d319b1
|
|
@ -8,7 +8,7 @@ final case class ArtifactsParams(
|
||||||
classifiers: Option[Seq[Classifier]],
|
classifiers: Option[Seq[Classifier]],
|
||||||
res: Seq[Resolution],
|
res: Seq[Resolution],
|
||||||
includeSignatures: Boolean,
|
includeSignatures: Boolean,
|
||||||
createLogger: () => CacheLogger,
|
logger: CacheLogger,
|
||||||
projectName: String,
|
projectName: String,
|
||||||
sbtClassifiers: Boolean,
|
sbtClassifiers: Boolean,
|
||||||
cacheParams: CacheParams
|
cacheParams: CacheParams
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,6 @@ object ArtifactsRun {
|
||||||
|
|
||||||
val artifactFilesOrErrors = try {
|
val artifactFilesOrErrors = try {
|
||||||
pool = Schedulable.fixedThreadPool(params.cacheParams.parallel)
|
pool = Schedulable.fixedThreadPool(params.cacheParams.parallel)
|
||||||
artifactsLogger = params.createLogger()
|
|
||||||
|
|
||||||
val artifactFileOrErrorTasks = allArtifacts.toVector.distinct.map { a =>
|
val artifactFileOrErrorTasks = allArtifacts.toVector.distinct.map { a =>
|
||||||
Cache.file[Task](
|
Cache.file[Task](
|
||||||
|
|
@ -48,7 +47,7 @@ object ArtifactsRun {
|
||||||
params.cacheParams.cacheLocation,
|
params.cacheParams.cacheLocation,
|
||||||
params.cacheParams.cachePolicies,
|
params.cacheParams.cachePolicies,
|
||||||
checksums = params.cacheParams.checksum,
|
checksums = params.cacheParams.checksum,
|
||||||
logger = Some(artifactsLogger),
|
logger = Some(params.logger),
|
||||||
pool = pool,
|
pool = pool,
|
||||||
ttl = params.cacheParams.ttl
|
ttl = params.cacheParams.ttl
|
||||||
)
|
)
|
||||||
|
|
@ -66,6 +65,7 @@ object ArtifactsRun {
|
||||||
if (verbosityLevel >= 2)
|
if (verbosityLevel >= 2)
|
||||||
log.info(artifactInitialMessage)
|
log.info(artifactInitialMessage)
|
||||||
|
|
||||||
|
artifactsLogger = params.logger
|
||||||
artifactsLogger.init(if (printOptionalMessage) log.info(artifactInitialMessage))
|
artifactsLogger.init(if (printOptionalMessage) log.info(artifactInitialMessage))
|
||||||
|
|
||||||
Task.gather.gather(artifactFileOrErrorTasks).attempt.unsafeRun()(ExecutionContext.fromExecutorService(pool)) match {
|
Task.gather.gather(artifactFileOrErrorTasks).attempt.unsafeRun()(ExecutionContext.fromExecutorService(pool)) match {
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen
|
||||||
val verbosityLevel = 0
|
val verbosityLevel = 0
|
||||||
|
|
||||||
val ttl = CacheDefaults.ttl
|
val ttl = CacheDefaults.ttl
|
||||||
val createLogger = conf.createLogger.map(_.create).getOrElse { () =>
|
val logger = conf.createLogger.map(_.create()).getOrElse {
|
||||||
new TermDisplay(new OutputStreamWriter(System.err), fallbackMode = true)
|
new TermDisplay(new OutputStreamWriter(System.err), fallbackMode = true)
|
||||||
}
|
}
|
||||||
val cache = conf.cache.getOrElse(CacheDefaults.location)
|
val cache = conf.cache.getOrElse(CacheDefaults.location)
|
||||||
|
|
@ -152,7 +152,7 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen
|
||||||
typelevel = typelevel,
|
typelevel = typelevel,
|
||||||
sbtClassifiers = false,
|
sbtClassifiers = false,
|
||||||
projectName = projectName,
|
projectName = projectName,
|
||||||
createLogger = createLogger,
|
logger = logger,
|
||||||
cacheParams = coursier.params.CacheParams(
|
cacheParams = coursier.params.CacheParams(
|
||||||
cacheLocation = cache,
|
cacheLocation = cache,
|
||||||
cachePolicies = cachePolicies,
|
cachePolicies = cachePolicies,
|
||||||
|
|
@ -172,7 +172,7 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen
|
||||||
classifiers = classifiers,
|
classifiers = classifiers,
|
||||||
res = resolutions.values.toSeq,
|
res = resolutions.values.toSeq,
|
||||||
includeSignatures = false,
|
includeSignatures = false,
|
||||||
createLogger = createLogger,
|
logger = logger,
|
||||||
projectName = projectName,
|
projectName = projectName,
|
||||||
sbtClassifiers = false,
|
sbtClassifiers = false,
|
||||||
cacheParams = CacheParams(
|
cacheParams = CacheParams(
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ final case class ResolutionParams(
|
||||||
typelevel: Boolean,
|
typelevel: Boolean,
|
||||||
sbtClassifiers: Boolean,
|
sbtClassifiers: Boolean,
|
||||||
projectName: String,
|
projectName: String,
|
||||||
createLogger: () => CacheLogger,
|
logger: CacheLogger,
|
||||||
cacheParams: coursier.params.CacheParams,
|
cacheParams: coursier.params.CacheParams,
|
||||||
params: coursier.params.ResolutionParams
|
params: coursier.params.ResolutionParams
|
||||||
) {
|
) {
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,9 @@ object ResolutionRun {
|
||||||
|
|
||||||
val resOrError: Either[ResolutionError, Resolution] = try {
|
val resOrError: Either[ResolutionError, Resolution] = try {
|
||||||
pool = Schedulable.fixedThreadPool(params.cacheParams.parallel)
|
pool = Schedulable.fixedThreadPool(params.cacheParams.parallel)
|
||||||
resLogger = params.createLogger()
|
resLogger = params.logger
|
||||||
|
|
||||||
val fetchs = Cache.fetchs[Task](params.cacheParams.cacheLocation, params.cacheParams.cachePolicies, checksums = params.cacheParams.checksum, logger = Some(resLogger), pool = pool, ttl = params.cacheParams.ttl)
|
val fetchs = Cache.fetchs[Task](params.cacheParams.cacheLocation, params.cacheParams.cachePolicies, checksums = params.cacheParams.checksum, logger = Some(params.logger), pool = pool, ttl = params.cacheParams.ttl)
|
||||||
|
|
||||||
val fetch = ResolutionProcess.fetch(
|
val fetch = ResolutionProcess.fetch(
|
||||||
params.repositories,
|
params.repositories,
|
||||||
|
|
@ -80,6 +80,7 @@ object ResolutionRun {
|
||||||
if (verbosityLevel >= 2)
|
if (verbosityLevel >= 2)
|
||||||
log.info(initialMessage)
|
log.info(initialMessage)
|
||||||
|
|
||||||
|
resLogger = params.logger
|
||||||
resLogger.init(if (printOptionalMessage) log.info(initialMessage))
|
resLogger.init(if (printOptionalMessage) log.info(initialMessage))
|
||||||
|
|
||||||
startRes
|
startRes
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ object ArtifactsTasks {
|
||||||
classifiers = classifiers,
|
classifiers = classifiers,
|
||||||
res = res,
|
res = res,
|
||||||
includeSignatures = includeSignatures,
|
includeSignatures = includeSignatures,
|
||||||
createLogger = createLogger.create,
|
logger = createLogger.create(),
|
||||||
projectName = projectName,
|
projectName = projectName,
|
||||||
sbtClassifiers = sbtClassifiers,
|
sbtClassifiers = sbtClassifiers,
|
||||||
cacheParams = CacheParams(
|
cacheParams = CacheParams(
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@ object ResolutionTasks {
|
||||||
typelevel = typelevel,
|
typelevel = typelevel,
|
||||||
sbtClassifiers = sbtClassifiers,
|
sbtClassifiers = sbtClassifiers,
|
||||||
projectName = projectName,
|
projectName = projectName,
|
||||||
createLogger = createLogger.create,
|
logger = createLogger.create(),
|
||||||
cacheParams = coursier.params.CacheParams(
|
cacheParams = coursier.params.CacheParams(
|
||||||
cacheLocation = cache,
|
cacheLocation = cache,
|
||||||
cachePolicies = cachePolicies,
|
cachePolicies = cachePolicies,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue