Small fixes

Disable thread joining. Fixed log coloring not applying based on level.
bkacjios · Mar 21, 2023 · 6107ffc · 6107ffc
1 parent d8c629d
commit 6107ffc
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/launcher/downloader/init.lua b/launcher/downloader/init.lua
@@ -51,9 +51,6 @@ end
 
 function downloader.close()
 	requests_channel:push(false)
-	if THREAD:isRunning() then
-		THREAD:wait()
-	end
 end
 
 return downloader
diff --git a/source/modules/downloader/init.lua b/source/modules/downloader/init.lua
@@ -53,9 +53,6 @@ end
 
 function downloader.close()
 	requests_channel:push(false)
-	if THREAD:isRunning() then
-		THREAD:wait()
-	end
 end
 
 return downloader
diff --git a/source/modules/log.lua b/source/modules/log.lua
@@ -58,7 +58,7 @@ for level, info in pairs(log.levels) do
 	local filter = log.levels[log.level].priority
 	local stamp = function()
 		local date = os.date(log.date_format)
-		log.print(format("[%s%-5s\27[0m - %s] ", "\27[35m", level:upper(), date))
+		log.print(format("[%s%-5s\27[0m - %s] ", info.color, level:upper(), date))
 	end
 	log[level] = function(text, ...)
 		if info.priority < filter then return end

diff --git a/source/modules/web/init.lua b/source/modules/web/init.lua
@@ -64,9 +64,6 @@ end
 
 function web.close()
 	requests_channel:push(false) -- false ends the thread loop
-	if THREAD:isRunning() then
-		THREAD:wait()
-	end
 end
 
 return web