Skip to content
This repository was archived by the owner on Mar 23, 2025. It is now read-only.

Commit b471ed2

Browse files
committed
Upgrade MG
1 parent 7507ab6 commit b471ed2

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

shard.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ shards:
5454

5555
mg:
5656
git: https://github.com/hkalexling/mg.git
57-
version: 0.1.0+git.commit.8d378bf58da442be2e5a27670233d43687d14121
57+
version: 0.2.0+git.commit.171c46489d991a8353818e00fc6a3c4e0809ded9
5858

5959
myhtml:
6060
git: https://github.com/kostya/myhtml.git

src/logger.cr

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ class Logger
66
SEVERITY_IDS = [0, 4, 5, 2, 3]
77
COLORS = [:light_cyan, :light_red, :red, :light_yellow, :light_magenta]
88

9+
getter raw_log = Log.for ""
10+
911
@@severity : Log::Severity = :info
1012

1113
use_default
1214

1315
def initialize
1416
@@severity = Logger.get_severity
15-
@log = Log.for("")
1617
@backend = Log::IOBackend.new
1718

1819
format_proc = ->(entry : Log::Entry, io : IO) do
@@ -54,10 +55,6 @@ class Logger
5455
{% end %}
5556
end
5657

57-
def self.reset
58-
@@default = Logger.new
59-
end
60-
6158
# Ignores @@severity and always log msg
6259
def log(msg)
6360
@backend.write Log::Entry.new "", Log::Severity::None, msg,
@@ -70,7 +67,7 @@ class Logger
7067

7168
{% for lvl in LEVELS %}
7269
def {{lvl.id}}(msg)
73-
@log.{{lvl.id}} { msg }
70+
raw_log.{{lvl.id}} { msg }
7471
end
7572
def self.{{lvl.id}}(msg)
7673
default.not_nil!.{{lvl.id}} msg

src/storage.cr

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,10 @@ class Storage
3939
DB.open "sqlite3://#{@path}" do |db|
4040
begin
4141
severity = Logger.get_severity
42-
Log.setup "mg", severity
43-
MG::Migration.new(db).migrate
42+
MG::Migration.new(db, log: Logger.default.raw_log).migrate
4443
rescue e
45-
Logger.reset
4644
Logger.fatal "DB migration failed. #{e}"
4745
raise e
48-
else
49-
Logger.reset
5046
end
5147

5248
user_count = db.query_one "select count(*) from users", as: Int32

0 commit comments

Comments
 (0)