Skip to content

Commit be24fc2

Browse files
committed
add FIRPrivateConfig
1 parent 265f0e5 commit be24fc2

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

Sources/DataConnect.swift

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,6 @@ public class DataConnect {
4343
static var enablePrivacyLogging = true
4444
}
4545

46-
private static let logLevelQueue = DispatchQueue(
47-
label: "com.google.firebase.dataconnect.logLevel",
48-
attributes: .concurrent
49-
)
50-
private static var _logLevel: LogLevel = .WARN
51-
52-
public static var logLevel: LogLevel {
53-
get {
54-
return logLevelQueue.sync { _logLevel }
55-
}
56-
set {
57-
logLevelQueue.async(flags: .barrier) {
58-
_logLevel = newValue
59-
}
60-
}
61-
}
62-
6346
// MARK: Static Creation
6447

6548
/// Returns an instance of DataConnect matching the parameters.

Sources/Internal/GrpcClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ actor GrpcClient: CustomStringConvertible {
244244
var options = CallOptions(customMetadata: headers)
245245

246246
// Enable GRPC tracing
247-
if DataConnect.logLevel.rawValue <= LogLevel.DEBUG.rawValue,
247+
if DataConnectLogger.logLevel.rawValue <= FirebaseLoggerLevel.info.rawValue,
248248
DataConnect.ArgumentFlag.enablePrivacyLogging == false {
249249
var logger = Logger(label: "com.google.firebase.dataconnect.grpc")
250250
logger.logLevel = .trace

Sources/Internal/Logger/DataConnectLogger.swift

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// limitations under the License.
1414

1515
import OSLog
16+
import FirebaseCore
1617

1718
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
1819
class DataConnectLogger {
@@ -22,25 +23,41 @@ class DataConnectLogger {
2223
)
2324

2425
private static let logPrefix = "\(Version.sdkVersion) - [FirebaseDataConnect]"
25-
26-
static func debug(_ message: String, code: MessageCode = .placeHolder) {
27-
if DataConnect.logLevel.rawValue <= LogLevel.DEBUG.rawValue {
26+
27+
static let logLevel = FirebaseConfiguration.shared.loggerLevel()
28+
29+
static func error(_ message: String, code: MessageCode = .placeHolder) {
30+
if logLevel.rawValue <= FirebaseLoggerLevel.debug.rawValue {
2831
let messageCode = String(format: "I-FDC%06d", code.rawValue)
29-
logger.debug("\(logPrefix)[\(messageCode)] \(message)")
32+
logger.error("\(logPrefix)[\(messageCode)] \(message)")
3033
}
3134
}
32-
35+
3336
static func warning(_ message: String, code: MessageCode = .placeHolder) {
34-
if DataConnect.logLevel.rawValue <= LogLevel.WARN.rawValue {
37+
if logLevel.rawValue <= FirebaseLoggerLevel.warning.rawValue {
3538
let messageCode = String(format: "I-FDC%06d", code.rawValue)
3639
logger.warning("\(logPrefix)[\(messageCode)] \(message)")
3740
}
3841
}
39-
40-
static func error(_ message: String, code: MessageCode = .placeHolder) {
41-
if DataConnect.logLevel.rawValue <= LogLevel.WARN.rawValue {
42+
43+
static func notice(_ message: String, code: MessageCode = .placeHolder) {
44+
if logLevel.rawValue <= FirebaseLoggerLevel.notice.rawValue {
4245
let messageCode = String(format: "I-FDC%06d", code.rawValue)
43-
logger.error("\(logPrefix)[\(messageCode)] \(message)")
46+
logger.notice("\(logPrefix)[\(messageCode)] \(message)")
47+
}
48+
}
49+
50+
static func info(_ message: String, code: MessageCode = .placeHolder) {
51+
if logLevel.rawValue <= FirebaseLoggerLevel.info.rawValue {
52+
let messageCode = String(format: "I-FDC%06d", code.rawValue)
53+
logger.info("\(logPrefix)[\(messageCode)] \(message)")
54+
}
55+
}
56+
57+
static func debug(_ message: String, code: MessageCode = .placeHolder) {
58+
if logLevel.rawValue <= FirebaseLoggerLevel.debug.rawValue {
59+
let messageCode = String(format: "I-FDC%06d", code.rawValue)
60+
logger.debug("\(logPrefix)[\(messageCode)] \(message)")
4461
}
4562
}
4663
}

0 commit comments

Comments
 (0)