mirror of
https://github.com/hkalexling/Mango.git
synced 2025-08-03 03:15:31 -04:00
Upgrade MG
This commit is contained in:
parent
7507ab64ad
commit
b471ed2fa0
@ -54,7 +54,7 @@ shards:
|
|||||||
|
|
||||||
mg:
|
mg:
|
||||||
git: https://github.com/hkalexling/mg.git
|
git: https://github.com/hkalexling/mg.git
|
||||||
version: 0.1.0+git.commit.8d378bf58da442be2e5a27670233d43687d14121
|
version: 0.2.0+git.commit.171c46489d991a8353818e00fc6a3c4e0809ded9
|
||||||
|
|
||||||
myhtml:
|
myhtml:
|
||||||
git: https://github.com/kostya/myhtml.git
|
git: https://github.com/kostya/myhtml.git
|
||||||
|
@ -6,13 +6,14 @@ class Logger
|
|||||||
SEVERITY_IDS = [0, 4, 5, 2, 3]
|
SEVERITY_IDS = [0, 4, 5, 2, 3]
|
||||||
COLORS = [:light_cyan, :light_red, :red, :light_yellow, :light_magenta]
|
COLORS = [:light_cyan, :light_red, :red, :light_yellow, :light_magenta]
|
||||||
|
|
||||||
|
getter raw_log = Log.for ""
|
||||||
|
|
||||||
@@severity : Log::Severity = :info
|
@@severity : Log::Severity = :info
|
||||||
|
|
||||||
use_default
|
use_default
|
||||||
|
|
||||||
def initialize
|
def initialize
|
||||||
@@severity = Logger.get_severity
|
@@severity = Logger.get_severity
|
||||||
@log = Log.for("")
|
|
||||||
@backend = Log::IOBackend.new
|
@backend = Log::IOBackend.new
|
||||||
|
|
||||||
format_proc = ->(entry : Log::Entry, io : IO) do
|
format_proc = ->(entry : Log::Entry, io : IO) do
|
||||||
@ -54,10 +55,6 @@ class Logger
|
|||||||
{% end %}
|
{% end %}
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.reset
|
|
||||||
@@default = Logger.new
|
|
||||||
end
|
|
||||||
|
|
||||||
# Ignores @@severity and always log msg
|
# Ignores @@severity and always log msg
|
||||||
def log(msg)
|
def log(msg)
|
||||||
@backend.write Log::Entry.new "", Log::Severity::None, msg,
|
@backend.write Log::Entry.new "", Log::Severity::None, msg,
|
||||||
@ -70,7 +67,7 @@ class Logger
|
|||||||
|
|
||||||
{% for lvl in LEVELS %}
|
{% for lvl in LEVELS %}
|
||||||
def {{lvl.id}}(msg)
|
def {{lvl.id}}(msg)
|
||||||
@log.{{lvl.id}} { msg }
|
raw_log.{{lvl.id}} { msg }
|
||||||
end
|
end
|
||||||
def self.{{lvl.id}}(msg)
|
def self.{{lvl.id}}(msg)
|
||||||
default.not_nil!.{{lvl.id}} msg
|
default.not_nil!.{{lvl.id}} msg
|
||||||
|
@ -39,14 +39,10 @@ class Storage
|
|||||||
DB.open "sqlite3://#{@path}" do |db|
|
DB.open "sqlite3://#{@path}" do |db|
|
||||||
begin
|
begin
|
||||||
severity = Logger.get_severity
|
severity = Logger.get_severity
|
||||||
Log.setup "mg", severity
|
MG::Migration.new(db, log: Logger.default.raw_log).migrate
|
||||||
MG::Migration.new(db).migrate
|
|
||||||
rescue e
|
rescue e
|
||||||
Logger.reset
|
|
||||||
Logger.fatal "DB migration failed. #{e}"
|
Logger.fatal "DB migration failed. #{e}"
|
||||||
raise e
|
raise e
|
||||||
else
|
|
||||||
Logger.reset
|
|
||||||
end
|
end
|
||||||
|
|
||||||
user_count = db.query_one "select count(*) from users", as: Int32
|
user_count = db.query_one "select count(*) from users", as: Int32
|
||||||
|
Loading…
x
Reference in New Issue
Block a user