hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-20 17:41:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Integrate fmt into log

Browse source
This commit is contained in:
Lucien Greathouse 2019-11-15 15:39:15 -08:00
parent 3126de2c37
commit 3a9f438390
5 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugin/src/InstanceMap.lua
View file

@ -119,7 +119,7 @@ function InstanceMap:__connectSignals(instance)
end
function InstanceMap:__maybeFireInstanceChanged(instance, propertyName)
Log.trace("%s.%s changed", instance:GetFullName(), propertyName)
Log.trace("{}.{} changed", instance:GetFullName(), propertyName)
if self.onInstanceChanged ~= nil then
self.onInstanceChanged(instance, propertyName)

36
plugin/src/ServeSession.lua
View file

@ -11,28 +11,26 @@ local Status = strict("Session.Status", {
Disconnected = "Disconnected",
})
local function fmtPatch(patch)
local output = Fmt.debugOutputBuffer()
local function debugPatch(patch)
return Fmt.debugify(patch, function(patch, output)
output:writeLine("Patch {{")
output:indent()
output:writeLine("Patch {{")
output:indent()
for removed in ipairs(patch.removed) do
output:writeLine("Remove ID {}", removed)
end
for removed in ipairs(patch.removed) do
output:writeLine("Remove ID {}", removed)
end
for id, added in pairs(patch.added) do
output:writeLine("Add ID {} {:#?}", id, added)
end
for id, added in pairs(patch.added) do
output:writeLine("Add ID {} {:#?}", id, added)
end
for _, updated in ipairs(patch.updated) do
output:writeLine("Update ID {} {:#?}", updated.id, updated)
end
for _, updated in ipairs(patch.updated) do
output:writeLine("Update ID {} {:#?}", updated.id, updated)
end
output:unindent()
output:writeLine("}")
return output:finish()
output:unindent()
output:write("}")
end)
end
local ServeSession = {}
@ -104,7 +102,7 @@ function ServeSession:__initialSync(rootInstanceId)
game
)
Log.trace("Computed hydration patch: %s", fmtPatch(hydratePatch))
Log.trace("Computed hydration patch: {:#?}", debugPatch(hydratePatch))
-- TODO: Prompt user to notify them of this patch, since it's
-- effectively a conflict between the Rojo server and the client.