From b471ed2fa0223566d04ae58497b768f57b66673f Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Sun, 17 Jan 2021 15:49:10 +0000
Subject: [PATCH] Upgrade MG

---
 shard.lock     | 2 +-
 src/logger.cr  | 9 +++------
 src/storage.cr | 6 +-----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/shard.lock b/shard.lock
index 90acc99..99d3c5a 100644
--- a/shard.lock
+++ b/shard.lock
@@ -54,7 +54,7 @@ shards:
 
   mg:
     git: https://github.com/hkalexling/mg.git
-    version: 0.1.0+git.commit.8d378bf58da442be2e5a27670233d43687d14121
+    version: 0.2.0+git.commit.171c46489d991a8353818e00fc6a3c4e0809ded9
 
   myhtml:
     git: https://github.com/kostya/myhtml.git
diff --git a/src/logger.cr b/src/logger.cr
index ba5aa31..d434cfa 100644
--- a/src/logger.cr
+++ b/src/logger.cr
@@ -6,13 +6,14 @@ class Logger
   SEVERITY_IDS = [0, 4, 5, 2, 3]
   COLORS       = [:light_cyan, :light_red, :red, :light_yellow, :light_magenta]
 
+  getter raw_log = Log.for ""
+
   @@severity : Log::Severity = :info
 
   use_default
 
   def initialize
     @@severity = Logger.get_severity
-    @log = Log.for("")
     @backend = Log::IOBackend.new
 
     format_proc = ->(entry : Log::Entry, io : IO) do
@@ -54,10 +55,6 @@ class Logger
     {% end %}
   end
 
-  def self.reset
-    @@default = Logger.new
-  end
-
   # Ignores @@severity and always log msg
   def log(msg)
     @backend.write Log::Entry.new "", Log::Severity::None, msg,
@@ -70,7 +67,7 @@ class Logger
 
   {% for lvl in LEVELS %}
     def {{lvl.id}}(msg)
-      @log.{{lvl.id}} { msg }
+      raw_log.{{lvl.id}} { msg }
     end
     def self.{{lvl.id}}(msg)
       default.not_nil!.{{lvl.id}} msg
diff --git a/src/storage.cr b/src/storage.cr
index 2d87025..f169c5c 100644
--- a/src/storage.cr
+++ b/src/storage.cr
@@ -39,14 +39,10 @@ class Storage
       DB.open "sqlite3://#{@path}" do |db|
         begin
           severity = Logger.get_severity
-          Log.setup "mg", severity
-          MG::Migration.new(db).migrate
+          MG::Migration.new(db, log: Logger.default.raw_log).migrate
         rescue e
-          Logger.reset
           Logger.fatal "DB migration failed. #{e}"
           raise e
-        else
-          Logger.reset
         end
 
         user_count = db.query_one "select count(*) from users", as: Int32