Disable file infra log by default

zio · Dec 5, 2021 · a99f30e · a99f30e
1 parent ccef345
commit a99f30e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/quill-core-portable/src/main/scala/io/getquill/util/Messages.scala b/quill-core-portable/src/main/scala/io/getquill/util/Messages.scala
@@ -26,7 +26,7 @@ object Messages {
   def traceAstSimple = cache("quill.trace.ast.simple", variable("quill.trace.ast.simple", "quill_trace_ast_simple", "false").toBoolean)
   def traceQuats = cache("quill.trace.quat", QuatTrace(variable("quill.trace.quat", "quill_trace_quat", QuatTrace.None.value)))
   def cacheDynamicQueries = cache("quill.query.cacheDaynamic", variable("quill.query.cacheDaynamic", "query_query_cacheDaynamic", "true").toBoolean)
-  def quillLogFile = cache("quill.log.file", LogToFile(variable("quill.log.file", "quill_log_file", "./target/queries.sql")))
+  def quillLogFile = cache("quill.log.file", LogToFile(variable("quill.log.file", "quill_log_file", "false")))
 
   sealed trait LogToFile
   object LogToFile {

diff --git a/quill-core/src/main/scala/io/getquill/util/QueryLogger.scala b/quill-core/src/main/scala/io/getquill/util/QueryLogger.scala
@@ -88,34 +88,37 @@ class QueryLogger(logToFile: LogToFile) {
       .map(appender => Has(appender.get.filter((ctx, _) => ctx.get(LogAnnotation.Level) >= logLevel)))
       >+> Logging.make >>> modifyLoggerM(addTimestamp[String]))
 
-  private[getquill] val env = {
+  def produceLoggerEnv(file: String) =
+    ZEnv.live >>>
+      logFile(
+        logLevel = LogLevel.Info,
+        format = LogFormat.fromFunction((ctx, str) => {
+          str
+        }),
+        destination = Paths.get(file)
+      ) >>> Logging.withRootLoggerName("query-logger")
+
+  lazy val env = {
     logToFile match {
-      case LogToFile.Enabled(file) =>
-        ZEnv.live >>>
-          logFile(
-            logLevel = LogLevel.Info,
-            format = LogFormat.fromFunction((ctx, str) => {
-              str
-            }),
-            destination = Paths.get(file)
-          ) >>> Logging.withRootLoggerName("query-logger")
-      case LogToFile.Disabled => Logging.ignore
+      case LogToFile.Enabled(file) => Some(produceLoggerEnv(file))
+      case LogToFile.Disabled      => None
     }
   }
 
-  private[getquill] val runtime = Runtime.unsafeFromLayer(env)
+  private[getquill] val runtime =
+    env.map(Runtime.unsafeFromLayer(_))
 
   def apply(queryString: String, sourcePath: String, line: Int, column: Int): Unit = {
-    quillLogFile match {
-      case LogToFile.Enabled(_) =>
-        runtime.unsafeRunAsync_(log.info(
+    runtime match {
+      case Some(runtimeValue) =>
+        runtimeValue.unsafeRunAsync_(log.info(
           s"""
              |-- file: $sourcePath:$line:$column
              |-- time: ${ZonedDateTime.now().format(LogDatetimeFormatter.isoLocalDateTimeFormatter)}
              |$queryString;
              |""".stripMargin
         ))
-      case LogToFile.Disabled => // do nothing
+      case None => // do nothing
     }
   }
 }