Merge pull request #212 from smartcontractkit/feature/logger

Feature/logger
smartcontractkit · Jan 20, 2021 · 03c01b7 · 03c01b7
2 parents dd551fe + 8826e14
commit 03c01b7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/2-step/adapter.js b/2-step/adapter.js
@@ -40,11 +40,11 @@ const execute = (input, callback) => {
     return callback(400, Requester.errored(jobRunID, 'invalid dividend'))
   }
 
-  logger.info('Getting value from contract: ' + contract)
+  logger.debug('Getting value from contract: ' + contract)
   getContractPrice(contract)
     .then((price) => {
       price = price / multiply
-      logger.info('Value: ' + price)
+      logger.debug('Value: ' + price)
       if (price <= 0) {
         return callback(500, Requester.errored(jobRunID, 'on-chain value equal or less than 0'))
       }
@@ -55,7 +55,7 @@ const execute = (input, callback) => {
         }
 
         const result = transform(response.result, price, operator, dividend)
-        logger.info('New result: ' + result)
+        logger.debug('New result: ' + result)
 
         response.data.result = result
         response.result = result

diff --git a/bootstrap/src/index.ts b/bootstrap/src/index.ts
@@ -43,9 +43,14 @@ const withStatusCode = (execute: ExecuteWrappedResponse) => async (data_: Adapte
 // Log adapter input & output data
 const withLogger = (execute: ExecuteWrappedResponse) => async (data: AdapterRequest) => {
   logger.debug('Input: ', { input: data })
-  const result = await execute(data)
-  logger.debug(`Output: [${result.statusCode}]: `, { output: result.data })
-  return result
+  try {
+    const result = await execute(data)
+    logger.debug(`Output: [${result.statusCode}]: `, { output: result.data })
+    return result
+  } catch (error) {
+    logger.error(error.toString(), { stack: error.stack })
+    throw error
+  }
 }
 
 const middleware = [withLogger, skipOnError(withCache), withStatusCode]

diff --git a/composite/defi-pulse/src/symbols/index.ts b/composite/defi-pulse/src/symbols/index.ts
@@ -29,7 +29,7 @@ const ERC20ABI_bytes32 = [
 const getERC20Symbol = async (rpcUrl: string, address: string): Promise<string> => {
   const provider = new ethers.providers.JsonRpcProvider(rpcUrl)
   const _symbol = (abi: any) => new ethers.Contract(address, abi, provider).symbol()
-  logger.info('Calling blockchain to get ERC20 token symbol...')
+  logger.debug('Calling blockchain to get ERC20 token symbol...')
   try {
     return await _symbol(ERC20ABI)
   } catch (ignoreable) {

diff --git a/external-adapter/src/requester.ts b/external-adapter/src/requester.ts
@@ -54,7 +54,13 @@ export class Requester {
       }
 
       // Success
-      logger.info(`Received response: ${JSON.stringify(response.data)}`)
+      const { data, status, statusText } = response
+      logger.debug({
+        message: 'Received response',
+        data,
+        status,
+        statusText,
+      })
       return response
     }
 

diff --git a/orchid-bandwidth/test/adapter_test.js b/orchid-bandwidth/test/adapter_test.js
@@ -14,7 +14,6 @@ describe('execute', () => {
     requests.forEach((req) => {
       it(`${req.name}`, (done) => {
         execute(req.testData, (statusCode, data) => {
-          console.log(JSON.stringify(data))
           assertSuccess({ expected: 200, actual: statusCode }, data, jobID)
           assert.isAbove(data.result, 0)
           assert.isAbove(data.data.result, 0)

diff --git a/typings/@chainlink/index.d.ts b/typings/@chainlink/index.d.ts
@@ -56,6 +56,7 @@ declare module '@chainlink/types' {
     stack: string
     cause: string
   }
+
   export type AdapterErrorResponse = {
     jobRunID: string
     status: string
@@ -67,7 +68,7 @@ declare module '@chainlink/types' {
   // TODO: clean this ASAP
   export type WrappedAdapterResponse = {
     statusCode: number
-    data: AdapterResponse
+    data: AdapterResponse | AdapterErrorResponse
   }
   export type ExecuteWrappedResponse = (input: AdapterRequest) => Promise<WrappedAdapterResponse>