From ea62c99853b765ae176f8695f795aa9d6c25326a Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sat, 24 Apr 2021 17:47:28 +0200
Subject: [PATCH] default log level

---
 src/babashka/impl/tasks.clj | 12 ++++++------
 src/babashka/main.clj       | 11 +++++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/babashka/impl/tasks.clj b/src/babashka/impl/tasks.clj
index c3645b18..aca729e1 100644
--- a/src/babashka/impl/tasks.clj
+++ b/src/babashka/impl/tasks.clj
@@ -7,7 +7,8 @@
             [sci.core :as sci]))
 
 (def sci-ns (sci/create-ns 'babashka.tasks nil))
-(def log-level (sci/new-dynamic-var '*-log-level* :info {:ns sci-ns}))
+(def default-log-level :error)
+(def log-level (sci/new-dynamic-var '*-log-level* default-log-level {:ns sci-ns}))
 (def task-name (sci/new-dynamic-var '*-task-name* nil {:ns sci-ns}))
 
 (defn log-info [& strs]
@@ -74,9 +75,8 @@
         cmd (into cmd args)
         local-log-level (:log-level opts)]
     (sci/binding [log-level (or local-log-level @log-level)]
-
-      (apply log-info cmd)
-      (exit-non-zero (p/process cmd (merge default-opts opts))))))
+      (apply log-info (cons "clojure" cmd))
+      (exit-non-zero (deps/clojure cmd (merge default-opts opts))))))
 
 (defn -wait [res]
   (when res
@@ -191,11 +191,11 @@
                (conj order task-name))
            order))))))
 
-(defn assemble-task [task-name parallel?]
+(defn assemble-task [task-name parallel? log-level]
   (let [task-name (symbol task-name)
         bb-edn @bb-edn
         tasks (get bb-edn :tasks)
-        log-level (or (:log-level tasks) :info)
+        log-level (or log-level (:log-level tasks) default-log-level)
         task (get tasks task-name)]
     (if task
       (let [m? (map? task)
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index bdc2f754..82b4f9f8 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -415,9 +415,14 @@ When no eval opts or subcommand is provided, the implicit subcommand is repl.")
          args (seq args)]
     (if args
       (let [fst (first args)]
-        (if (= "--parallel" fst)
+        (case fst
+          "--parallel"
           (recur (assoc opts-map :parallel-tasks true)
                  (next args))
+          "--log-level"
+          (let [args (next args)]
+            (recur (assoc opts-map :log-level (keyword (first args)))
+                   (next args)))
           (assoc opts-map :run fst :command-line-args (next args))))
       opts-map)))
 
@@ -691,7 +696,9 @@ When no eval opts or subcommand is provided, the implicit subcommand is repl.")
                                    "-main")]
                     [[(format "(ns user (:require [%1$s])) (apply %1$s/%2$s *command-line-args*)"
                               ns var-name)] nil])
-                  run (tasks/assemble-task run (:parallel-tasks cli-opts))
+                  run (tasks/assemble-task run
+                                           (:parallel-tasks cli-opts)
+                                           (:log-level cli-opts))
                   file (try [[(read-file file)] nil]
                             (catch Exception e
                               (error-handler e {:expression expressions