Added some additional logging to identify when a LeaseManager was abl…

…e to lookup a secret.

lib/storage-service.js

@@ -67,17 +67,23 @@ class StorageService {
   lookup(token, secret, ProviderType) {
     return this._getLeaseManager(token, secret, ProviderType).then((manager) => {
       if (manager.status === STATUS.READY) {
+        StorageService.logManagerEvent('INFO', 'Manager was able to lookup a secret.', manager);
+
         // LeaseManager is ready, immediately resolve with data
         return manager.data;
       }
 
       // Queue the promise states with a timeout
-      return onceWithTimeout(manager, 'ready', this.timeout)
-        .then(() => manager.data)
-        .catch((err) => {
-          this._managers.delete(manager.name);
-          throw err;
-        });
+      return onceWithTimeout(manager, 'ready', this.timeout).then(() => {
+        StorageService.logManagerEvent('INFO', 'Manager was able to lookup a secret.', manager);
+
+        return manager.data;
+      })
+      .catch((err) => {
+        StorageService.logManagerEvent('ERROR', err, manager);
+        this._managers.delete(manager.name);
+        throw err;
+      });
     });
   }
 
@@ -100,7 +106,11 @@ class StorageService {
     return this.defaultToken.initialize().then(() => {
       // If the LeaseManager is already provisioned, return it
       if (this._managers.has(secretID)) {
-        return this._managers.get(secretID).initialize();
+        const manager = this._managers.get(secretID);
+
+        StorageService.logManagerEvent('DEBUG', 'Retrieved LeaseManager.', manager);
+
+        return manager.initialize();
       }
 
       const manager = this._createManager(this.defaultToken.data.token, secret, ProviderType, secretID);
@@ -129,6 +139,7 @@ class StorageService {
     const manager = new LeaseManager(provider, secretID);
 
     StorageService.setEvents(manager);
+    StorageService.logManagerEvent('DEBUG', 'Created LeaseManager.', manager);
 
     // Don't cache providers that can't be renewed
     if (manager.renewable) {
@@ -161,38 +172,20 @@ class StorageService {
    * @param {LeaseManager} manager
    */
   static setEvents(manager) {
-    const type = manager.provider.constructor.name;
-
     manager.on('ready', () => {
-      Log.log('INFO', 'Manager is ready', {
-        provider: type,
-        status: manager.status,
-        lease_duration: manager.lease_duration
-      });
+      StorageService.logManagerEvent('INFO', 'Manager is ready.', manager);
     });
 
     manager.on('renewed', () => {
-      Log.log('INFO', 'Manager renewed provider\'s data', {
-        provider: type,
-        status: manager.status,
-        lease_duration: manager.lease_duration
-      });
+      StorageService.logManagerEvent('INFO', 'Manager renewed provider\'s data.', manager);
     });
 
     manager.on('error', (err) => {
-      Log.log('ERROR', err, {
-        provider: type,
-        status: manager.status,
-        lease_duration: manager.lease_duration
-      });
+      StorageService.logManagerEvent('ERROR', err, manager);
     });
 
     manager.on('invalidate', () => {
-      Log.log('INFO', 'Invalidating token due to expiration.', {
-        provider: type,
-        status: manager.status,
-        lease_duration: manager.lease_duration
-      });
+      StorageService.logManagerEvent('INFO', 'Invalidating manager due to expiration.', manager);
     });
   }
 }