Skip to content

Reduce logging level to stop dumping sensitive information. #899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: stable
Choose a base branch
from
Open

Reduce logging level to stop dumping sensitive information. #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d69e86
change logging level to avoid dumping sensitive info
tushar-os Jan 17, 2020
7ef0e1e
reduce logging level to stop dumping sensitive information.
tushar-os Apr 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/scala/org/apache/mesos/chronos/scheduler/api/DependentJobResource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ class DependentJobResource @Inject()(
jobScheduler.updateJob(oldJob, newJob)

log.info("Job parent: [ %s ], name: %s, command: %s".format(newJob.parents.mkString(","), newJob.name, newJob.command))
log.info("Replaced job: '%s', oldJob: '%s', newJob: '%s'".format(
log.info("Replaced job: '%s'".format(newJob.name))
log.fine("Replaced job: '%s', oldJob: '%s', newJob: '%s'".format(
newJob.name,
new String(JobUtils.toBytes(oldJob), Charsets.UTF_8),
new String(JobUtils.toBytes(newJob), Charsets.UTF_8)))
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/org/apache/mesos/chronos/scheduler/api/Iso8601JobResource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ class Iso8601JobResource @Inject()(
}

jobScheduler.updateJob(oldJob, newJob)

log.info("Replaced job: '%s', oldJob: '%s', newJob: '%s'".format(
log.info("Replaced job: '%s'".format(newJob.name))
log.fine("Replaced job: '%s', oldJob: '%s', newJob: '%s'".format(
newJob.name,
new String(JobUtils.toBytes(oldJob), Charsets.UTF_8),
new String(JobUtils.toBytes(newJob), Charsets.UTF_8)))
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/org/apache/mesos/chronos/scheduler/jobs/JobsObserver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ object JobsObserver {

def composite(observers: List[Observer]): Observer = {
case event => observers.foreach(observer => observer.lift.apply(event).orElse {
log.info(s"$observer does not handle $event")
log.fine(s"$observer does not handle $event")
Some(Unit)
})
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@ package org.apache.mesos.chronos.scheduler.mesos

import java.util.logging.Logger

import org.apache.mesos.chronos.scheduler.config.SchedulerConfiguration
import org.apache.mesos.chronos.scheduler.jobs._
import org.apache.mesos.chronos.scheduler.jobs.constraints.Constraint
import org.apache.mesos.chronos.utils.JobDeserializer
import com.google.inject.Inject
import mesosphere.mesos.util.FrameworkIdUtil
import org.apache.mesos.Protos._
import org.apache.mesos.chronos.scheduler.config.SchedulerConfiguration
import org.apache.mesos.chronos.scheduler.jobs._
import org.apache.mesos.chronos.utils.JobDeserializer
import org.apache.mesos.{Protos, Scheduler, SchedulerDriver}
import org.joda.time.DateTime

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.collection.mutable.{Buffer, HashMap, HashSet}

/**
* Provides the interface to chronos. Receives callbacks from chronos when resources are offered, declined etc.
Expand Down Expand Up @@ -175,7 +173,9 @@ class MesosJobFramework @Inject()(
val mesosTasks = subTasks.map(task => {
taskBuilder.getMesosTaskInfoBuilder(task._1, task._2, task._3).setSlaveId(task._3.getSlaveId).build()
})
log.info("Launching tasks from offer: " + offer + " with tasks: " + mesosTasks)
log.info("Launching tasks from offer with id: " + offer.getId + "with url info: " + offer.getUrl +
"for slave id: " + offer.getSlaveId)
log.fine("Launching tasks from offer: " + offer + " with tasks: " + mesosTasks)
val status: Protos.Status = mesosDriver.get().launchTasks(
List(offer.getId).asJava,
mesosTasks.asJava
Expand Down
4 changes: 3 additions & 1 deletion src/main/scala/org/apache/mesos/chronos/scheduler/state/MesosStatePersistenceStore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ class MesosStatePersistenceStore @Inject()(val zk: CuratorFramework,
}

def persistJob(job: BaseJob): Boolean = {
log.info("Persisting job '%s' with data '%s'" format(job.name, job.toString))
log.info("Persisting job: '%s' with description: '%s' , docker container info: '%s', job arguments as: " +
"and task info data as: '%s'" format(job.name, job.description, job.container, job.arguments, job.taskInfoData))
log.fine("Persisting job '%s' with data '%s'" format(job.name, job.toString))
persistData(jobName(job.name), JobUtils.toBytes(job))
}

Expand Down