Skip to content

Commit 212c711

Browse files
authored
reverting out overzealo (#168)
us trace logging
1 parent c19ba09 commit 212c711

File tree

2 files changed

+34
-38
lines changed

2 files changed

+34
-38
lines changed

Sources/Automerge/BoundTypes/AutomergeText.swift

+17-16
Original file line numberDiff line numberDiff line change
@@ -395,22 +395,23 @@ import os
395395

396396
extension AutomergeText: ObservableObject {
397397
fileprivate func sendObjectWillChange() {
398-
#if canImport(os)
399-
if #available(macOS 11, iOS 14, *) {
400-
let logger = Logger(subsystem: "Automerge", category: "AutomergeText")
401-
logger.trace("\(self.debugDescription) sending ObjectWillChange")
402-
let callStacks = Thread.callStackSymbols
403-
if callStacks.count > 5 {
404-
for callStackFrame in callStacks[0 ... 5] {
405-
logger.trace(" - \(callStackFrame)")
406-
}
407-
} else {
408-
for callStackFrame in callStacks {
409-
logger.trace(" - \(callStackFrame)")
410-
}
411-
}
412-
}
413-
#endif
398+
// DEBUGGING / DIAGNOSTICS CODE to show where object changes are being initiated
399+
// #if canImport(os)
400+
// if #available(macOS 11, iOS 14, *) {
401+
// let logger = Logger(subsystem: "Automerge", category: "AutomergeText")
402+
// logger.trace("\(self.debugDescription) sending ObjectWillChange")
403+
// let callStacks = Thread.callStackSymbols
404+
// if callStacks.count > 5 {
405+
// for callStackFrame in callStacks[0 ... 5] {
406+
// logger.trace(" - \(callStackFrame)")
407+
// }
408+
// } else {
409+
// for callStackFrame in callStacks {
410+
// logger.trace(" - \(callStackFrame)")
411+
// }
412+
// }
413+
// }
414+
// #endif
414415
objectWillChange.send()
415416
}
416417
}

Sources/Automerge/Document.swift

+17-22
Original file line numberDiff line numberDiff line change
@@ -1055,28 +1055,23 @@ import OSLog
10551055

10561056
extension Document: ObservableObject {
10571057
fileprivate func sendObjectWillChange() {
1058-
#if canImport(os)
1059-
if #available(macOS 11, iOS 14, *) {
1060-
let logger = Logger(subsystem: "Automerge", category: "AutomergeText")
1061-
1062-
logger.trace("Document \(String(describing: self)) sending ObjectWillChange")
1063-
// concurrency violation
1064-
// let headsString = self.heads().map { ch in
1065-
// ch.debugDescription
1066-
// }.joined(separator: ".")
1067-
// logger.trace("heads: \(headsString)")
1068-
let callStacks = Thread.callStackSymbols
1069-
if callStacks.count > 5 {
1070-
for callStackFrame in callStacks[0 ... 5] {
1071-
logger.trace(" - \(callStackFrame)")
1072-
}
1073-
} else {
1074-
for callStackFrame in callStacks {
1075-
logger.trace(" - \(callStackFrame)")
1076-
}
1077-
}
1078-
}
1079-
#endif
1058+
// DEBUGGING / DIAGNOSTICS CODE to show where object changes are being initiated
1059+
// #if canImport(os)
1060+
// if #available(macOS 11, iOS 14, *) {
1061+
// let logger = Logger(subsystem: "Automerge", category: "AutomergeText")
1062+
// logger.trace("Document \(String(describing: self)) sending ObjectWillChange")
1063+
// let callStacks = Thread.callStackSymbols
1064+
// if callStacks.count > 5 {
1065+
// for callStackFrame in callStacks[0 ... 5] {
1066+
// logger.trace(" - \(callStackFrame)")
1067+
// }
1068+
// } else {
1069+
// for callStackFrame in callStacks {
1070+
// logger.trace(" - \(callStackFrame)")
1071+
// }
1072+
// }
1073+
// }
1074+
// #endif
10801075
objectWillChange.send()
10811076
}
10821077
}

0 commit comments

Comments
 (0)