Skip to content

Commit 43bd65a

Browse files
committed
Updated logger
1 parent 741331d commit 43bd65a

File tree

5 files changed

+22
-26
lines changed

5 files changed

+22
-26
lines changed

GoodNetworking-Sample/GoodNetworking-Sample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sources/GoodNetworking/Providers/DefaultSessionProvider.swift

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,8 @@ public actor DefaultSessionProvider: NetworkSessionProviding {
7474
/// - Returns: `true`, indicating the session is valid.
7575
public var isSessionValid: Bool {
7676
logger.log(
77-
level: .debug,
7877
message: "✅ Default session is always valid",
79-
privacy: .auto
78+
level: .debug
8079
)
8180
return true
8281
}
@@ -86,9 +85,8 @@ public actor DefaultSessionProvider: NetworkSessionProviding {
8685
/// Since the default session does not support invalidation, this method simply logs a message without performing any action.
8786
public func invalidateSession() async {
8887
logger.log(
89-
level: .debug,
9088
message: "❌ Default session cannot be invalidated",
91-
privacy: .auto
89+
level: .debug
9290
)
9391
}
9492

@@ -100,9 +98,8 @@ public actor DefaultSessionProvider: NetworkSessionProviding {
10098
/// - Returns: A new instance of `Alamofire.Session`.
10199
public func makeSession() async -> Alamofire.Session {
102100
logger.log(
103-
level: .debug,
104101
message: "❌ Default Session Provider cannot be create a new Session, it's setup in the initializer",
105-
privacy: .auto
102+
level: .debug
106103
)
107104

108105
return currentSession
@@ -116,9 +113,8 @@ public actor DefaultSessionProvider: NetworkSessionProviding {
116113
/// - Returns: The current or newly created `Alamofire.Session`.
117114
public func resolveSession() async -> Alamofire.Session {
118115
logger.log(
119-
level: .debug,
120116
message: "❌ Default session provider always resolves current session which is setup in the initializer",
121-
privacy: .auto
117+
level: .debug
122118
)
123119
return currentSession
124120
}

Sources/GoodNetworking/Session/LoggingEventMonitor.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public struct LoggingEventMonitor: EventMonitor, Sendable {
5656

5757
switch response.result {
5858
case .success:
59-
logger?.log(level: .debug, message: logMessage, privacy: .auto)
59+
logger?.log(message: logMessage, level: .debug, privacy: .auto)
6060
case .failure:
61-
logger?.log(level: .fault, message: logMessage, privacy: .auto)
61+
logger?.log(message: logMessage, level: .fault, privacy: .auto)
6262
}
6363
}
6464

Sources/GoodNetworking/Wrapper/Resource.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,27 +114,27 @@ extension Resource {
114114
}
115115

116116
public func create() async throws {
117-
logger.log(level: .error, message: "CREATE operation not defined for resource \(String(describing: R.self))", privacy: .auto)
117+
logger.log(message: "CREATE operation not defined for resource \(String(describing: R.self))", level: .error)
118118
}
119119

120120
public func read(forceReload: Bool = false) async throws {
121-
logger.log(level: .error, message: "READ operation not defined for resource \(String(describing: R.self))", privacy: .auto)
121+
logger.log(message: "READ operation not defined for resource \(String(describing: R.self))", level: .error)
122122
}
123123

124124
public func updateRemote() async throws {
125-
logger.log(level: .error, message: "UPDATE operation not defined for resource \(String(describing: R.self))", privacy: .auto)
125+
logger.log(message: "UPDATE operation not defined for resource \(String(describing: R.self))", level: .error)
126126
}
127127

128128
public func delete() async throws {
129-
logger.log(level: .error, message: "DELETE operation not defined for resource \(String(describing: R.self))", privacy: .auto)
129+
logger.log(message: "DELETE operation not defined for resource \(String(describing: R.self))", level: .error)
130130
}
131131

132132
public func firstPage(forceReload: Bool = false) async throws {
133-
logger.log(level: .error, message: "LIST operation not defined for resource \(String(describing: R.self))", privacy: .auto)
133+
logger.log(message: "LIST operation not defined for resource \(String(describing: R.self))", level: .error)
134134
}
135135

136136
public func nextPage() async throws {
137-
logger.log(level: .error, message: "LIST operation not defined for resource \(String(describing: R.self))", privacy: .auto)
137+
logger.log(message: "LIST operation not defined for resource \(String(describing: R.self))", level: .error)
138138
}
139139

140140
}
@@ -146,7 +146,7 @@ extension Resource where R: Creatable {
146146

147147
public func create() async throws {
148148
guard let request = try R.request(from: state.value) else {
149-
return logger.log(level: .error, message: "Creating nil resource always fails! Use create(request:) with a custom request or supply a resource to create.", privacy: .auto)
149+
return logger.log(message: "Creating nil resource always fails! Use create(request:) with a custom request or supply a resource to create.", level: .error)
150150
}
151151
try await create(request: request)
152152
}
@@ -197,15 +197,15 @@ extension Resource where R: Readable {
197197
let resource = state.value
198198
guard let request = try R.request(from: resource) else {
199199
self.state = .idle
200-
return logger.log(level: .error, message: "Requesting nil resource always fails! Use read(request:forceReload:) with a custom request or supply a resource to read.", privacy: .auto)
200+
return logger.log(message: "Requesting nil resource always fails! Use read(request:forceReload:) with a custom request or supply a resource to read.", level: .error)
201201
}
202202

203203
try await read(request: request, forceReload: forceReload)
204204
}
205205

206206
public func read(request: R.ReadRequest, forceReload: Bool = false) async throws {
207207
guard !state.isAvailable || forceReload else {
208-
return logger.log(level: .info, message: "Skipping read - value already exists", privacy: .auto)
208+
return logger.log(message: "Skipping read - value already exists", level: .info)
209209
}
210210

211211
let resource = state.value
@@ -245,7 +245,7 @@ extension Resource where R: Updatable {
245245

246246
public func updateRemote() async throws {
247247
guard let request = try R.request(from: state.value) else {
248-
return logger.log(level: .error, message: "Updating resource to nil always fails! Use DELETE instead.", privacy: .auto)
248+
return logger.log(message: "Updating resource to nil always fails! Use DELETE instead.", level: .error)
249249
}
250250
try await updateRemote(request: request)
251251
}
@@ -293,7 +293,7 @@ extension Resource where R: Deletable {
293293

294294
public func delete() async throws {
295295
guard let request = try R.request(from: state.value) else {
296-
return logger.log(level: .error, message: "Deleting nil resource always fails. Use delete(request:) with a custom request or supply a resource to delete.", privacy: .auto)
296+
return logger.log(message: "Deleting nil resource always fails. Use delete(request:) with a custom request or supply a resource to delete.", level: .error)
297297
}
298298
try await delete(request: request)
299299
}

0 commit comments

Comments
 (0)