replace print's with Amplify.API.log (#233)

lawmicha · web-flow · commit 0075df7ca206 · 2019-12-04T09:58:00.000-08:00
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift
@@ -8,6 +8,7 @@
 import Foundation
 import AWSCore
 import AWSPluginsCore
+import Amplify
 
 /// Auth interceptor for API Key based authentication
 class APIKeyAuthInterceptor: AuthInterceptor {
@@ -29,7 +30,7 @@ class APIKeyAuthInterceptor: AuthInterceptor {
     func interceptConnection(_ request: AppSyncConnectionRequest,
                              for url: URL) -> AppSyncConnectionRequest {
         guard let host = url.host else {
-            print("[APIKeyAuthInterceptor] interceptConnection missing host")
+            Amplify.API.log.warn("[APIKeyAuthInterceptor] interceptConnection missing host")
             return request
         }
 
@@ -55,7 +56,7 @@ class APIKeyAuthInterceptor: AuthInterceptor {
 
     func interceptMessage(_ message: AppSyncMessage, for url: URL) -> AppSyncMessage {
         guard let host = url.host else {
-            print("[APIKeyAuthInterceptor] interceptMessage missing host")
+            Amplify.API.log.warn("[APIKeyAuthInterceptor] interceptMessage missing host")
             return message
         }
 
@@ -71,8 +72,7 @@ class APIKeyAuthInterceptor: AuthInterceptor {
                                                type: message.messageType)
             return signedMessage
         default:
-            // TODO: Log.verbose
-            print("Message type does not need signing - \(message.messageType)")
+            Amplify.API.log.verbose("Message type does not need signing - \(message.messageType)")
         }
         return message
     }
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Interceptor/SubscriptionInterceptor/AppSyncSubscriptionInterceptor.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Interceptor/SubscriptionInterceptor/AppSyncSubscriptionInterceptor.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Amplify
 
 /// Converts a connection request created with a standard endpoint configuration, to an AppSync Realtime Gateway
 /// request by rewriting the URL.
@@ -14,7 +15,7 @@ class AppSyncSubscriptionInterceptor: ConnectionInterceptor {
     func interceptConnection(_ request: AppSyncConnectionRequest,
                              for url: URL) -> AppSyncConnectionRequest {
         guard let host = url.host else {
-            print("[AppSyncSubscriptionInterceptor] interceptConnection missing host")
+            Amplify.API.log.warn("[AppSyncSubscriptionInterceptor] interceptConnection missing host")
             return request
         }
         guard var urlComponents = URLComponents(url: request.url, resolvingAgainstBaseURL: false) else {
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Interceptor/SubscriptionInterceptor/CognitoUserPoolsAuthInterceptor.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Interceptor/SubscriptionInterceptor/CognitoUserPoolsAuthInterceptor.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 import AWSPluginsCore
+import Amplify
 
 class CognitoUserPoolsAuthInterceptor: AuthInterceptor {
 
@@ -18,7 +19,7 @@ class CognitoUserPoolsAuthInterceptor: AuthInterceptor {
 
     func interceptMessage(_ message: AppSyncMessage, for url: URL) -> AppSyncMessage {
         guard let host = url.host else {
-            print("[CognitoUserPoolsAuthInterceptor] interceptMessage missing host")
+            Amplify.API.log.warn("[CognitoUserPoolsAuthInterceptor] interceptMessage missing host")
             return message
         }
 
@@ -40,15 +41,14 @@ class CognitoUserPoolsAuthInterceptor: AuthInterceptor {
                                                type: message.messageType)
             return signedMessage
         default:
-            // TODO: Log.verbose
-            print("Message type does not need signing - \(message.messageType)")
+            Amplify.API.log.verbose("Message type does not need signing - \(message.messageType)")
         }
         return message
     }
 
     func interceptConnection(_ request: AppSyncConnectionRequest, for url: URL) -> AppSyncConnectionRequest {
         guard let host = url.host else {
-            print("[CognitoUserPoolsAuthInterceptor] interceptConnection missing host")
+            Amplify.API.log.warn("[CognitoUserPoolsAuthInterceptor] interceptConnection missing host")
             return request
         }
 
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift
@@ -8,6 +8,7 @@
 import Foundation
 import AWSCore
 import AWSPluginsCore
+import Amplify
 
 class IAMAuthInterceptor: AuthInterceptor {
 
@@ -30,8 +31,7 @@ class IAMAuthInterceptor: AuthInterceptor {
                                                type: message.messageType)
             return signedMessage
         default:
-            // TODO: Log.verbose
-            print("Message type does not need signing - \(message.messageType)")
+            Amplify.API.log.verbose("Message type does not need signing - \(message.messageType)")
         }
         return message
     }
@@ -62,7 +62,7 @@ class IAMAuthInterceptor: AuthInterceptor {
 
     final private func getAuthHeader(_ url: URL, with payload: String) -> IAMAuthenticationHeader? {
         guard let host = url.host else {
-            print("[IAMAuthInterceptor] getAuthHeader missing host")
+            Amplify.API.log.warn("[IAMAuthInterceptor] getAuthHeader missing host")
             return nil
         }
         let amzDate =  NSDate.aws_clockSkewFixed() as NSDate
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/ConnectionProvider/AppSyncConnectionProvider+EventHandler.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/ConnectionProvider/AppSyncConnectionProvider+EventHandler.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Amplify
 
 extension AppSyncConnectionProvider {
 
@@ -39,7 +40,7 @@ extension AppSyncConnectionProvider {
         case .data(let websocketResponse):
             handleResponse(websocketResponse)
         case .error(let error):
-            print("Got error bac")
+            Amplify.API.log.error("Websocket Error: \(error)")
         }
     }
 
@@ -61,7 +62,8 @@ extension AppSyncConnectionProvider {
                         self.listener?(.connection(self.state))
                     }
                 case .connected, .disconnected:
-                    print("[AppSyncConnectionProvider] connectionAck recieved while connection is \(state)")
+                    Amplify.API.log.verbose(
+                        "[AppSyncConnectionProvider] connectionAck recieved while connection is \(state)")
             }
 
         case .error:
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/ConnectionProvider/AppSyncConnectionProvider.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/ConnectionProvider/AppSyncConnectionProvider.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Amplify
 
 /// Appsync Real time connection that connects to subscriptions
 /// through websocket.
@@ -69,7 +70,7 @@ class AppSyncConnectionProvider: ConnectionProvider {
     }
 
     func subscribe(_ subscriptionItem: SubscriptionItem) {
-        print("subscribe, sending start subscription message...")
+        Amplify.API.log.verbose("subscribe, sending start subscription message...")
         let payload: AppSyncMessage.Payload
         do {
             payload = try convertToPayload(for: subscriptionItem.requestString,
@@ -92,7 +93,7 @@ class AppSyncConnectionProvider: ConnectionProvider {
     }
 
     func unsubscribe(_ identifier: String) {
-        print("sendStartSubscriptionMessage, sending start subscription message...")
+        Amplify.API.log.verbose("sendStartSubscriptionMessage, sending start subscription message...")
         let message = AppSyncMessage(id: identifier, type: .unsubscribe)
         do {
             try write(message)
@@ -120,7 +121,7 @@ class AppSyncConnectionProvider: ConnectionProvider {
     func sendConnectionInitMessage() {
         switch state {
         case .connecting:
-            print("sendConnectionInitMessage, sending init message...")
+            Amplify.API.log.verbose("sendConnectionInitMessage, sending init message...")
             let message = AppSyncMessage(type: .connectionInit)
             do {
                 try write(message)
@@ -146,7 +147,7 @@ class AppSyncConnectionProvider: ConnectionProvider {
         guard case .connected = state else {
             return
         }
-        print("Validating connection")
+        Amplify.API.log.verbose("Validating connection")
         let staleThreshold = lastKeepAliveTime + staleConnectionTimeout
         let currentTime = DispatchTime.now()
         if staleThreshold < currentTime {
@@ -157,7 +158,7 @@ class AppSyncConnectionProvider: ConnectionProvider {
                 }
                 self.state = .disconnected(error: nil)
                 self.websocketProvider.disconnect()
-                print("Realtime connection is stale, disconnecting.")
+                Amplify.API.log.verbose("Realtime connection is stale, disconnecting.")
                 self.listener?(.connection(self.state))
             }
 
@@ -193,7 +194,7 @@ class AppSyncConnectionProvider: ConnectionProvider {
             let jsonData = try JSONSerialization.data(withJSONObject: dataDict)
             payload.data = String(data: jsonData, encoding: .utf8)
         } catch {
-            print(error)
+            Amplify.API.log.error(error: error)
             let jsonError = ConnectionProviderError.jsonParse(nil, error)
             throw jsonError
         }
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/SubscriptionConnection/AppSyncSubscriptionConnection+EventHandler.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/SubscriptionConnection/AppSyncSubscriptionConnection+EventHandler.swift
@@ -34,13 +34,13 @@ extension AppSyncSubscriptionConnection {
         case .subscriptionError(let identifier, let error):
             handleSubscriptionError(identifier: identifier, error: error)
         case .error(let error):
-            print("Connection received error unmappable to any specific subscriber \(error)")
+            Amplify.API.log.error("Connection received error unmappable to any specific subscriber \(error)")
         }
 
     }
 
     func handleConnectionState(connectionState: ConnectionState) {
-        print("Connection state - \(connectionState)")
+        Amplify.API.log.verbose("Connection state - \(connectionState)")
 
         switch connectionState {
         case .connecting:
@@ -50,7 +50,7 @@ extension AppSyncSubscriptionConnection {
                 self?.subscriptionItems.forEach { identifier, subscriptionItem in
                     switch subscriptionItem.subscriptionConnectionState {
                     case .disconnected:
-                        print("Start subscription for identifier: \(subscriptionItem.identifier)")
+                        Amplify.API.log.verbose("Start subscription for identifier: \(subscriptionItem.identifier)")
                         subscriptionItem.setState(.connecting)
                         self?.connectionProvider.subscribe(subscriptionItem)
                     case .connecting, .connected:
@@ -87,7 +87,7 @@ extension AppSyncSubscriptionConnection {
             let data = try JSONEncoder().encode(payload)
             subscriptionItem.dispatch(data: data)
         } catch {
-            print(error)
+            Amplify.API.log.error(error: error)
             let jsonParserError = ConnectionProviderError.jsonParse(identifier, error)
             subscriptionItem.dispatch(error: APIError.pluginError(jsonParserError))
         }
@@ -96,7 +96,7 @@ extension AppSyncSubscriptionConnection {
     // MARK: Error Handling
 
     func handleSubscriptionError(identifier: String, error: ConnectionProviderError) {
-        print("Handle Subscription Error \(error)")
+        Amplify.API.log.verbose("Handle Subscription Error \(error)")
         guard let subscriptionItem = subscriptionItems[identifier] else {
             return
         }
@@ -108,21 +108,20 @@ extension AppSyncSubscriptionConnection {
     ///
     func tryReconnectOnError(error: ConnectionProviderError) {
         guard let retryHandler = retryHandler else {
-            // dispatch the error on one of the subscriptionItems
-            // or all of them?
-            print("1.no retry handler, dispatch to who?")
+            // TODO: dispatch the error on one of the subscriptionItems or all of them
+            Amplify.API.log.warn("[tryReconnectOnError] 1. no retry handler to reconnect on Error \(error)")
             return
         }
 
         let retryAdvice = retryHandler.shouldRetryRequest(for: error)
         if retryAdvice.shouldRetry, let retryInterval = retryAdvice.retryInterval {
-            // print("Retrying subscription \(subscriptionItem.identifier) after \(retryInterval)")
+            Amplify.API.log.verbose("Retrying websocket connect after retryInterval: \(retryInterval)")
             DispatchQueue.global().asyncAfter(deadline: .now() + retryInterval) {
                 self.connectionProvider.connect()
             }
         } else {
-            // just dispatch error to who?
-            print("2.no retry handler, dispatch to who?")
+            // TODO: dispatch the error on one of the subscriptionItems or all of them
+            Amplify.API.log.warn("[tryReconnectOnError] Error \(error)")
         }
     }
 }
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/SubscriptionConnection/AppSyncSubscriptionConnection.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/SubscriptionConnection/AppSyncSubscriptionConnection.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Amplify
 
 class AppSyncSubscriptionConnection: SubscriptionConnection, RetryableConnection {
 
@@ -60,7 +61,7 @@ class AppSyncSubscriptionConnection: SubscriptionConnection, RetryableConnection
     }
 
     func unsubscribe(item: SubscriptionItem) {
-        print("Unsubscribe - \(item.identifier)")
+        Amplify.API.log.verbose("Unsubscribe - \(item.identifier)")
         connectionProvider.unsubscribe(item.identifier)
     }
 
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/Websocket/StarscreamWebsocketProvider+WebsocketDelegate.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/Websocket/StarscreamWebsocketProvider+WebsocketDelegate.swift
@@ -7,22 +7,23 @@
 
 import Foundation
 import Starscream
+import Amplify
 
 /// Extension to handle delegate callback from Starscream
 extension StarscreamWebsocketProvider: Starscream.WebSocketDelegate {
 
     func websocketDidConnect(socket: WebSocketClient) {
-        print("WebsocketDidConnect")
+        Amplify.API.log.verbose("WebsocketDidConnect")
         listener?(.connect)
     }
 
     func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
-        print("WebsocketDidDisconnect - \(error?.localizedDescription ?? "No error")")
+        Amplify.API.log.verbose("WebsocketDidDisconnect - \(error?.localizedDescription ?? "No error")")
         listener?(.disconnect(error: error))
     }
 
     func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
-        print("WebsocketDidReceiveMessage - \(text)")
+        Amplify.API.log.verbose("WebsocketDidReceiveMessage - \(text)")
         let data = text.data(using: .utf8) ?? Data()
 
         do {
@@ -34,7 +35,7 @@ extension StarscreamWebsocketProvider: Starscream.WebSocketDelegate {
     }
 
     func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
-        print("WebsocketDidReceiveData - \(data)")
+        Amplify.API.log.verbose("WebsocketDidReceiveData - \(data)")
         do {
             let response = try JSONDecoder().decode(WebsocketProviderResponse.self, from: data)
             listener?(.data(response))
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/Websocket/StarscreamWebsocketProvider.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Subscription/Websocket/StarscreamWebsocketProvider.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 import Starscream
+import Amplify
 
 class StarscreamWebsocketProvider: WebsocketProvider {
 
@@ -31,7 +32,7 @@ class StarscreamWebsocketProvider: WebsocketProvider {
     }
 
     func connect() {
-        print("Connecting to url ...")
+        Amplify.API.log.verbose("Connecting to url ...")
         let signedRequest = interceptConnection(request, for: url)
         socket = WebSocket(url: signedRequest.url, protocols: protocols)
         socket?.delegate = self
@@ -43,7 +44,7 @@ class StarscreamWebsocketProvider: WebsocketProvider {
     }
 
     func write(_ message: String) {
-        print("Websocket write - \(message)")
+        Amplify.API.log.verbose("Websocket write - \(message)")
         socket?.write(string: message)
     }
 
diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Support/Utils/AppSyncJSONHelper.swift b/AmplifyPlugins/API/AWSAPICategoryPlugin/Support/Utils/AppSyncJSONHelper.swift
@@ -6,17 +6,18 @@
 //
 
 import Foundation
+import Amplify
 
 struct AppSyncJSONHelper {
 
     static func base64AuthenticationBlob(_ header: AuthenticationHeader ) -> String {
         let jsonEncoder = JSONEncoder()
         do {
             let jsonHeader = try jsonEncoder.encode(header)
-            print("Header - \(String(describing: String(data: jsonHeader, encoding: .utf8)))")
+            Amplify.API.log.verbose("Header - \(String(describing: String(data: jsonHeader, encoding: .utf8)))")
             return jsonHeader.base64EncodedString()
         } catch {
-            print(error)
+            Amplify.API.log.error(error: error)
         }
         return ""
     }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`//`
`7`	`7`
`8`	`8`	`import Foundation`
	`9`	`+import Amplify`
`9`	`10`
`10`	`11`	`extension AppSyncConnectionProvider {`
`11`	`12`
`@@ -39,7 +40,7 @@ extension AppSyncConnectionProvider {`
`39`	`40`	`case .data(let websocketResponse):`
`40`	`41`	`handleResponse(websocketResponse)`
`41`	`42`	`case .error(let error):`
`42`		`- print("Got error bac")`
	`43`	`+ Amplify.API.log.error("Websocket Error: \(error)")`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`
`@@ -61,7 +62,8 @@ extension AppSyncConnectionProvider {`
`61`	`62`	`self.listener?(.connection(self.state))`
`62`	`63`	`}`
`63`	`64`	`case .connected, .disconnected:`
`64`		`- print("[AppSyncConnectionProvider] connectionAck recieved while connection is \(state)")`
	`65`	`+ Amplify.API.log.verbose(`
	`66`	`+ "[AppSyncConnectionProvider] connectionAck recieved while connection is \(state)")`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`case .error:`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`import Foundation`
`9`	`9`	`import Starscream`
	`10`	`+import Amplify`
`10`	`11`
`11`	`12`	`class StarscreamWebsocketProvider: WebsocketProvider {`
`12`	`13`
`@@ -31,7 +32,7 @@ class StarscreamWebsocketProvider: WebsocketProvider {`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`func connect() {`
`34`		`- print("Connecting to url ...")`
	`35`	`+ Amplify.API.log.verbose("Connecting to url ...")`
`35`	`36`	`let signedRequest = interceptConnection(request, for: url)`
`36`	`37`	`socket = WebSocket(url: signedRequest.url, protocols: protocols)`
`37`	`38`	`socket?.delegate = self`
`@@ -43,7 +44,7 @@ class StarscreamWebsocketProvider: WebsocketProvider {`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`func write(_ message: String) {`
`46`		`- print("Websocket write - \(message)")`
	`47`	`+ Amplify.API.log.verbose("Websocket write - \(message)")`
`47`	`48`	`socket?.write(string: message)`
`48`	`49`	`}`
`49`	`50`