address InvalidRelationship and logging

packages/composer-common/lib/log/logger.js

@@ -175,7 +175,17 @@ class Logger {
             }
 
             // use the local version of padding rather than sprintf etc for speed
-            _logger.log(logLevel,callbackData+':'+this.padRight(this.str25,this.className)+':'+this.padRight(this.str25,method+'()'),msg, args);
+            const preamble = callbackData + ':' + this.padRight(this.str25,this.className) + ':' + this.padRight(this.str25,method+'()');
+
+            try {
+                _logger.log(logLevel, preamble, msg, args);
+            } catch(error) {
+                // an error can be thrown if for example using the winsonInjector logger and an argument is
+                // an InvalidRelationship where attempts to get object defined properties (which the winstonInjecttor does)
+                // throws an error.
+                let safeArgs = args.map(arg => arg.toString());
+                _logger.log(logLevel, preamble, msg, safeArgs);
+            }
         }
 
     }

packages/composer-common/test/log/logger.js

@@ -122,6 +122,25 @@ describe('Logger', () => {
             sinon.assert.calledWith(stubLogger.log, 'debug', sinon.match(/ScriptManager.*methodname\(\)/), 'message',['arg1','arg2','arg3']);
         });
 
+        it('should handle internal logger throwing an error', () => {
+            let stubLogger=  {
+                log: sinon.stub().onFirstCall().throws(new Error('I do not like the args'))
+            };
+
+            let stubArg2 = {
+                toString: sinon.stub().returns('My To String')
+            };
+
+            Logger.setFunctionalLogger(stubLogger);
+            Logger._envDebug='composer[debug]:*';
+            let logger = new Logger('ScriptManager');
+
+            logger.intlog('debug','methodname','message','arg1',stubArg2,'arg3');
+            sinon.assert.calledTwice(stubLogger.log);
+            sinon.assert.calledWith(stubLogger.log.firstCall, 'debug', sinon.match(/ScriptManager.*methodname\(\)/), 'message',['arg1',stubArg2,'arg3']);
+            sinon.assert.calledWith(stubLogger.log.secondCall, 'debug', sinon.match(/ScriptManager.*methodname\(\)/), 'message',['arg1','My To String','arg3']);
+        });
+
         it('should log to the functional logger, errors', () => {
             let stubLogger=  {
                 log: sinon.stub()

packages/composer-runtime/lib/invalidrelationship.js

@@ -60,10 +60,14 @@ class InvalidRelationship extends Relationship {
                     configurable: false,
                     enumerable: true,
                     get: () => {
-                        throw error;
+                        const err = new Error(`attempt to get property ${propertyName} on an InvalidRelationship is not allowed. InvalidRelationship created due to ${error.message}`);
+                        LOG.error(err);
+                        throw err;
                     },
                     set: () => {
-                        throw error;
+                        const err = new Error(`attempt to set property ${propertyName} on an InvalidRelationship is not allowed. InvalidRelationship created due to ${error.message}`);
+                        LOG.error(err);
+                        throw err;
                     }
                 });
             }

packages/composer-runtime/test/invalidrelationship.js

@@ -73,73 +73,73 @@ describe('InvalidRelationship', () => {
         it('should throw attempting to get the primitive value', () => {
             (() => {
                 relationship.value === 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/ such error/);
         });
 
         it('should throw attempting to set the primitive value', () => {
             (() => {
                 relationship.value = 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to get the primitive array value', () => {
             (() => {
                 relationship.values[1] === 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to set the primitive array value', () => {
             (() => {
                 relationship.values[1] = 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to get the concept value', () => {
             (() => {
                 relationship.concept.value === 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to set the concept value', () => {
             (() => {
                 relationship.concept.value = 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to get the concept array value', () => {
             (() => {
                 relationship.concepts[1].value === 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to set the concept array value', () => {
             (() => {
                 relationship.concepts[1].value = 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to get the relationship value', () => {
             (() => {
                 relationship.owner.value === 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to set the relationship value', () => {
             (() => {
                 relationship.owner.value = 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to get the relationship array value', () => {
             (() => {
                 relationship.owners[1].value === 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
         it('should throw attempting to set the relationship array value', () => {
             (() => {
                 relationship.owners[1].value = 'hello';
-            }).should.throw(/such error/);
+            }).should.throw(/.*is not allowed.*such error/);
         });
 
     });