diff --git a/platform/framework/src/register/ServiceCompositor.js b/platform/framework/src/register/ServiceCompositor.js index 4e6d9b6a5ed..50fb491eb53 100644 --- a/platform/framework/src/register/ServiceCompositor.js +++ b/platform/framework/src/register/ServiceCompositor.js @@ -75,6 +75,21 @@ define( ].join("")); } + //Log an info: defaults to "no service provide by" + function info(extension, category, message) { + var msg = message || "No service provided by"; + $log.info([ + msg, + " ", + category, + " ", + extension.key, + " from bundle ", + (extension.bundle || { path: "unknown bundle" }).path, + "; skipping." + ].join("")); + } + // Echo arguments; used to represent groups of non-built-in // extensions as a single dependency. function echoMany() { @@ -161,13 +176,13 @@ define( name = makeName("aggregator", service, index); if (!service) { - return warn(aggregator, "aggregator"); + return info(aggregator, "aggregator"); } // Aggregators need other services to aggregate, otherwise they // do nothing. if (!latest[service]) { - return warn( + return info( aggregator, "aggregator", "No services to aggregate for" diff --git a/platform/framework/test/register/ServiceCompositorSpec.js b/platform/framework/test/register/ServiceCompositorSpec.js index f2450e6ca86..8dc40f2adc3 100644 --- a/platform/framework/test/register/ServiceCompositorSpec.js +++ b/platform/framework/test/register/ServiceCompositorSpec.js @@ -195,7 +195,8 @@ define( expect(mockApp.service).not.toHaveBeenCalled(); // Should have gotten one warning for each skipped component - expect(mockLog.warn.calls.length).toEqual(3); + expect(mockLog.warn.calls.length).toEqual(2); + expect(mockLog.info.calls.length).toEqual(1); }); it("warns about and skips aggregators with zero providers", function () { @@ -217,7 +218,7 @@ define( expect(mockApp.service).not.toHaveBeenCalled(); // Should have gotten a warning - expect(mockLog.warn).toHaveBeenCalled(); + expect(mockLog.info).toHaveBeenCalled(); }); it("warns about and skips decorators with nothing to decorate", function () { diff --git a/platform/telemetry/src/TelemetryCapability.js b/platform/telemetry/src/TelemetryCapability.js index f784f59ffc7..94fe0cebb40 100644 --- a/platform/telemetry/src/TelemetryCapability.js +++ b/platform/telemetry/src/TelemetryCapability.js @@ -115,9 +115,7 @@ define( return (this.telemetryService = $injector.get("telemetryService")); } catch (e) { - // $injector should throw if telemetryService - // is unavailable or unsatisfiable. - $log.warn("Telemetry service unavailable"); + $log.info("Telemetry service unavailable"); return (this.telemetryService = null); } }; @@ -314,4 +312,3 @@ define( return TelemetryCapability; } ); - diff --git a/platform/telemetry/test/TelemetryCapabilitySpec.js b/platform/telemetry/test/TelemetryCapabilitySpec.js index c9ea459039e..b3b9c7b8898 100644 --- a/platform/telemetry/test/TelemetryCapabilitySpec.js +++ b/platform/telemetry/test/TelemetryCapabilitySpec.js @@ -199,7 +199,7 @@ define( telemetry.requestData(); - expect(mockLog.warn).toHaveBeenCalled(); + expect(mockLog.info).toHaveBeenCalled(); }); it("if a new style telemetry source is available, use it", function () {