Skip to content

Commit 3228f1a

Browse files
kiliankoekiliankoe
committed
use more sensible log levels
1 parent 13f026e commit 3228f1a

File tree

4 files changed

+23
-24
lines changed

4 files changed

+23
-24
lines changed

‎Sources/EmealKit/Cardservice/Cardservice.swift

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public struct Cardservice {
3636
""".data(using: .utf8)
3737
request.httpBody = data
3838

39-
Logger.emealKit.info("Performing Cardservice login for \(username, privacy: .private)")
39+
Logger.emealKit.debug("Performing Cardservice login for \(username, privacy: .private)")
4040
session.cardserviceDataTask(with: request, session: session) {
4141
(result: Result<[LoginResponse], CardserviceError>) in
4242
switch result {
@@ -49,7 +49,7 @@ public struct Cardservice {
4949
completion(.failure(.noCardDetails))
5050
return
5151
}
52-
Logger.emealKit.info("Successfully logged in to Cardservice")
52+
Logger.emealKit.debug("Successfully logged in to Cardservice")
5353
let service = Cardservice(username: username, cardnumber: first.karteNr, authToken: first.authToken)
5454
completion(.success(service))
5555
}
@@ -91,15 +91,15 @@ public struct Cardservice {
9191
}
9292
let request = URLRequest(url: url)
9393

94-
Logger.emealKit.info("Fetching card data for \(cardnumber, privacy: .private)")
94+
Logger.emealKit.debug("Fetching card data for \(cardnumber, privacy: .private)")
9595
session.cardserviceDataTask(with: request, session: session) {
9696
(result: Result<[CardDataService], CardserviceError>) in
9797
switch result {
9898
case .failure(let error):
9999
Logger.emealKit.error("Failed to fetch card data: \(String(describing: error))")
100100
completion(.failure(error))
101101
case .success(let servicedata):
102-
Logger.emealKit.info("Successfully fetched card data")
102+
Logger.emealKit.debug("Successfully fetched card data")
103103
let carddata = servicedata.map { CardData(from: $0) }
104104
completion(.success(carddata))
105105
}
@@ -150,10 +150,10 @@ public struct Cardservice {
150150

151151
// TODO: Both requests here should fire simultaneously and be synchronized afterwards. They don't depend on each
152152
// other.
153-
Logger.emealKit.info("Fetching transactions for \(self.cardnumber, privacy: .private) starting at \(begin.dayMonthYear) until \(end.dayMonthYear)")
153+
Logger.emealKit.debug("Fetching transactions for \(self.cardnumber, privacy: .private) starting at \(begin.dayMonthYear) until \(end.dayMonthYear)")
154154
session.cardserviceDataTask(with: transactionRequest, session: session) {
155155
(transactionsResult: Result<[TransactionService], CardserviceError>) in
156-
Logger.emealKit.info("Fetching positions for \(self.cardnumber, privacy: .private) starting at \(begin.dayMonthYear) until \(end.dayMonthYear)")
156+
Logger.emealKit.debug("Fetching positions for \(self.cardnumber, privacy: .private) starting at \(begin.dayMonthYear) until \(end.dayMonthYear)")
157157
session.cardserviceDataTask(with: positionsRequest, session: session) {
158158
(positionsResult: Result<[Transaction.Position], CardserviceError>) in
159159
switch (transactionsResult, positionsResult) {
@@ -169,7 +169,7 @@ public struct Cardservice {
169169
transactions.sort { lhs, rhs in
170170
return lhs.date < rhs.date
171171
}
172-
Logger.emealKit.info("Succesfully fetched transactions")
172+
Logger.emealKit.debug("Succesfully fetched transactions")
173173
completion(.success(transactions))
174174
} catch let error {
175175
Logger.emealKit.error("Failed to create transaction data: \(String(describing: error))")

‎Sources/EmealKit/Emeal/Emeal.swift

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Emeal: NSObject, NFCTagReaderSessionDelegate {
1818

1919
/// Begin the NFC reading session prompting the user to hold their device to their card.
2020
public func beginNFCSession() {
21-
Logger.emealKitNFC.debug("Beginning session")
21+
Logger.emealKit.debug("Beginning session")
2222
readerSession = NFCTagReaderSession(pollingOption: .iso14443, delegate: self)
2323
readerSession?.alertMessage = strings.alertMessage
2424
readerSession?.begin()
@@ -27,7 +27,7 @@ public class Emeal: NSObject, NFCTagReaderSessionDelegate {
2727
public func tagReaderSessionDidBecomeActive(_ session: NFCTagReaderSession) {}
2828

2929
public func tagReaderSession(_ session: NFCTagReaderSession, didInvalidateWithError error: Error) {
30-
Logger.emealKitNFC.error("Session invalidated with error: \(String(describing: error))")
30+
Logger.emealKit.error("Session invalidated with error: \(String(describing: error))")
3131
readerSession = nil
3232
DispatchQueue.main.async {
3333
self.delegate?.invalidate(with: error)
@@ -36,35 +36,35 @@ public class Emeal: NSObject, NFCTagReaderSessionDelegate {
3636

3737
public func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [NFCTag]) {
3838
guard let tag = tags.first else {
39-
Logger.emealKitNFC.error("Failed to read tags, no tags found")
39+
Logger.emealKit.error("Failed to read tags, no tags found")
4040
session.invalidate(errorMessage: strings.nfcReadingError)
4141
return
4242
}
43-
Logger.emealKitNFC.debug("Detected NFC tags (first will be used): \(tags)")
43+
Logger.emealKit.debug("Detected NFC tags (first will be used): \(tags)")
4444
Task {
4545
do {
46-
Logger.emealKitNFC.debug("Connecting to NFC tag")
46+
Logger.emealKit.debug("Connecting to NFC tag")
4747
try await session.connect(to: tag)
4848
} catch {
4949
session.invalidate(errorMessage: self.strings.nfcConnectionError)
50-
Logger.emealKitNFC.error("Failed to connect to NFC tag: \(String(describing: error))")
50+
Logger.emealKit.error("Failed to connect to NFC tag: \(String(describing: error))")
5151
return
5252
}
5353

5454
do {
5555
guard let card = GenericNFCTag(tag: tag) else {
56-
Logger.emealKitNFC.error("Unexpected tag type: \(String(describing: tag))")
56+
Logger.emealKit.error("Unexpected tag type: \(String(describing: tag))")
5757
self.readerSession?.invalidate(errorMessage: strings.nfcReadingError)
5858
return
5959
}
60-
Logger.emealKitNFC.info("Detected \(String(describing: card.card)) with ID \(card.id, privacy: .sensitive)")
60+
Logger.emealKit.info("Detected \(String(describing: card.card)) with ID \(card.id, privacy: .sensitive)")
6161
let (currentBalance, lastTransaction) = try await card.readTag()
6262
await MainActor.run {
6363
self.delegate?.readData(currentBalance: currentBalance, lastTransaction: lastTransaction)
6464
session.invalidate()
6565
}
6666
} catch {
67-
Logger.emealKitNFC.error("Failed to read NFC data from card: \(String(describing: error))")
67+
Logger.emealKit.error("Failed to read NFC data from card: \(String(describing: error))")
6868
await MainActor.run {
6969
session.invalidate(errorMessage: self.strings.nfcReadingError)
7070
}
@@ -115,9 +115,9 @@ private struct GenericNFCTag {
115115
func readTag() async throws -> (Double, Double) {
116116
await selectApp()
117117
let currentBalance = try await readCurrentBalance()
118-
Logger.emealKitNFC.info("Read current balance: \(currentBalance, privacy: .sensitive)")
118+
Logger.emealKit.info("Read current balance: \(currentBalance, privacy: .sensitive)")
119119
let lastTransaction = try await readLastTransaction()
120-
Logger.emealKitNFC.info("Read last transaction: \(lastTransaction, privacy: .sensitive)")
120+
Logger.emealKit.info("Read last transaction: \(lastTransaction, privacy: .sensitive)")
121121
return (currentBalance, lastTransaction)
122122
}
123123

‎Sources/EmealKit/Logger.swift

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ extension Logger {
44
private static var subsystem = "io.kilian.EmealKit"
55

66
static let emealKit = Logger(subsystem: subsystem, category: "EmealKit")
7-
static let emealKitNFC = Logger(subsystem: subsystem, category: "EmealKitNFC")
87
}

‎Sources/EmealKit/Mensa/MensaAPI.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extension URLSession {
4040
extension Canteen {
4141
public static func all(session: URLSession = .shared,
4242
completion: @escaping (Result<[Canteen], EmealError>) -> Void) {
43-
Logger.emealKit.info("Creating data task for all canteens")
43+
Logger.emealKit.debug("Creating data task for all canteens")
4444
session.emealDataTask(with: URL.Mensa.canteens) { result in
4545
switch result {
4646
case .failure(let error):
@@ -49,10 +49,10 @@ extension Canteen {
4949
case .success(let data):
5050
do {
5151
let canteens = try JSONDecoder().decode([Canteen].self, from: data)
52-
Logger.emealKit.info("Successfully fetched \(canteens.count) canteens")
52+
Logger.emealKit.debug("Successfully fetched \(canteens.count) canteens")
5353
completion(.success(canteens))
5454
} catch let error {
55-
Logger.emealKit.info("Failed to decode Canteen data: \(String(describing: error))")
55+
Logger.emealKit.error("Failed to decode Canteen data: \(String(describing: error))")
5656
completion(.failure(.other(error)))
5757
}
5858
}
@@ -96,7 +96,7 @@ extension Meal {
9696
on date: Date,
9797
session: URLSession = .shared,
9898
completion: @escaping (Result<[Meal], EmealError>) -> Void) {
99-
Logger.emealKit.info("Creating data task for canteen \(canteen) on \(date)")
99+
Logger.emealKit.debug("Creating data task for canteen \(canteen) on \(date)")
100100
session.emealDataTask(with: URL.Mensa.meals(canteen: canteen, date: date)) { result in
101101
switch result {
102102
case .failure(let error):
@@ -105,7 +105,7 @@ extension Meal {
105105
case .success(let data):
106106
do {
107107
let meals = try JSONDecoder().decode([Meal].self, from: data)
108-
Logger.emealKit.info("Successfully fetched \(meals.count) meals")
108+
Logger.emealKit.debug("Successfully fetched \(meals.count) meals")
109109
completion(.success(meals))
110110
} catch let error {
111111
Logger.emealKit.error("Failed to decode meal data: \(String(describing: error))")

0 commit comments

Comments
 (0)