          ;; nonce-writer?
 
        (if-let [ex (agent-error nonce-writer)]
-         (log2/exception log-state
-                         ex
-                         ::do-safe-nonce
-                         "System is down")
+         (log/exception log-state
+                        ex
+                        ::do-safe-nonce
+                        "System is down")
          log-state)))
     ([log-state dst offset]
      (let [length-to-fill (- (count dst) offset)
            tmp (get-random-bytes length-to-fill)]
        (b-t/byte-copy! dst offset length-to-fill tmp)
-       (log2/debug log-state
-                   ::safe-nonce!
-                   "Picked a random nonce")))))
+       (log/debug log-state
+                  ::safe-nonce!
+                  "Picked a random nonce")))))
 (comment
   (get-nonce-agent-state)
   (reset-safe-nonce-state!))

  (if keydir
    (let [secret (util/slurp-bytes (io/resource (str keydir "/.expertsonly/secretkey")))
          pair (TweetNaclFast$Box/keyPair_fromSecretKey secret)
          log-state (log2/info log-state
                               ::do-load-keypair
                               (str "FIXME: Don't record these\n"
                                    "Loaded secret key from file")
                               {::secret-key-contents (b-t/->string secret)
                                ::specs/secret-long (b-t/->string (.getSecretKey pair))
                                ::specs/public-long
                                (b-t/->string (.getPublicKey pair))})]
      {::java-key-pair pair
       ::weald/state log-state})
    ;; FIXME: This really should call random-keys instead.

   logger
   key-dir
   long-term?]
  (let [log-state (log/debug log-state
                             ::reload-nonce
                             "Top")
        raw-path (str key-dir "/.expertsonly/")
        path (io/resource raw-path)]
    (let [f (io/file path "lock")]
