This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 876848e0aa4e8dfa08dadb41f35f9375dfed04b5 Author: Thomas Bouron <[email protected]> AuthorDate: Thu Sep 12 14:16:46 2019 +0100 Make the logging consistent across all UI modules: - debug log enabled only for non-production build - angular debug runtime log enabled for non-production build --- ui-modules/app-inspector/app/index.js | 9 ++++++--- ui-modules/blueprint-composer/app/index.js | 9 ++++++--- ui-modules/catalog/app/index.js | 2 +- ui-modules/home/app/index.js | 7 ++++--- ui-modules/location-manager/app/index.js | 9 ++++++--- ui-modules/logout/app/index.js | 9 ++++++--- 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ui-modules/app-inspector/app/index.js b/ui-modules/app-inspector/app/index.js index 96a7a3d..dce6695 100755 --- a/ui-modules/app-inspector/app/index.js +++ b/ui-modules/app-inspector/app/index.js @@ -60,15 +60,18 @@ import {streamState} from "views/main/inspect/activities/detail/stream/stream.co import {catalogApiProvider} from "brooklyn-ui-utils/providers/catalog-api.provider"; import {apiObserverInterceptorProvider} from "brooklyn-ui-utils/providers/api-observer-interceptor.provider"; +const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false; + angular.module('app', [ngResource, ngCookies, ngSanitize, uiRouter, brCore, brUtilsGeneral, brServerStatus, brIconGenerator, brInterstitialSpinner, brooklynModuleLinks, brSensitiveField, brooklynUserManagement, brYamlEditor, brWebNotifications, brExpandablePanel, 'xeditable', apiProvider, entityTree, loadingState, configSensorTable, entityEffector, entityPolicy, breadcrumbNavigation, taskList, taskSunburst, stream, adjunctsList, managementDetail]) .provider('catalogApi', catalogApiProvider) .provider('apiObserverInterceptor', apiObserverInterceptorProvider) .filter('specToLabel', specToLabelFilter) - .config(['$urlRouterProvider', '$stateProvider', '$logProvider', '$httpProvider', 'apiObserverInterceptorProvider', applicationConfig]) + .config(['$urlRouterProvider', '$stateProvider', '$logProvider', '$compileProvider', '$httpProvider', 'apiObserverInterceptorProvider', applicationConfig]) .run(['editableOptions', 'editableThemes', applicationInitialization]); -function applicationConfig($urlRouterProvider, $stateProvider, $logProvider, $httpProvider, apiObserverInterceptorProvider) { - $logProvider.debugEnabled(false); +function applicationConfig($urlRouterProvider, $stateProvider, $logProvider, $compileProvider, $httpProvider, apiObserverInterceptorProvider) { + $logProvider.debugEnabled(!IS_PRODUCTION); + $compileProvider.debugInfoEnabled(!IS_PRODUCTION); $urlRouterProvider .otherwise('/'); $stateProvider diff --git a/ui-modules/blueprint-composer/app/index.js b/ui-modules/blueprint-composer/app/index.js index 08019ee..c0d8b40 100755 --- a/ui-modules/blueprint-composer/app/index.js +++ b/ui-modules/blueprint-composer/app/index.js @@ -71,6 +71,8 @@ import stackViewer from 'angular-java-stack-viewer'; import {EntityFamily} from "./components/util/model/entity.model"; import scriptTagDecorator from 'brooklyn-ui-utils/script-tag-non-overwrite/script-tag-non-overwrite'; +const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false; + angular.module('app', [ngAnimate, ngResource, ngCookies, ngClipboard, uiRouter, 'ui.router.state.events', brCore, brServerStatus, brAutoFocus, brIconGenerator, brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement, brYamlEditor, brUtils, brSpecEditor, brooklynCatalogSaver, brooklynApi, bottomSheet, stackViewer, brDragndrop, @@ -79,14 +81,15 @@ angular.module('app', [ngAnimate, ngResource, ngCookies, ngClipboard, uiRouter, dslService, paletteDragAndDropService, recentlyUsedService, scriptTagDecorator]) .provider('composerOverrides', composerOverridesProvider) .filter('dslParamLabel', ['$filter', dslParamLabelFilter]) - .config(['$urlRouterProvider', '$stateProvider', '$logProvider', applicationConfig]) + .config(['$urlRouterProvider', '$stateProvider', '$logProvider', '$compileProvider', applicationConfig]) .config(['actionServiceProvider', actionConfig]) .config(['paletteServiceProvider', paletteConfig]) .run(['$rootScope', '$state', 'brSnackbar', errorHandler]) .run(['$http', httpConfig]); -function applicationConfig($urlRouterProvider, $stateProvider, $logProvider) { - $logProvider.debugEnabled(false); +function applicationConfig($urlRouterProvider, $stateProvider, $logProvider, $compileProvider) { + $logProvider.debugEnabled(!IS_PRODUCTION); + $compileProvider.debugInfoEnabled(!IS_PRODUCTION); $urlRouterProvider .otherwise(graphicalState.url); $stateProvider diff --git a/ui-modules/catalog/app/index.js b/ui-modules/catalog/app/index.js index 34219dd..d3750a1 100644 --- a/ui-modules/catalog/app/index.js +++ b/ui-modules/catalog/app/index.js @@ -45,7 +45,7 @@ angular.module('app', [ngAnimate, ngCookies, ngResource, brCore, brServerStatus, function applicationConfig($logProvider, $compileProvider) { - $logProvider.debugEnabled(IS_PRODUCTION); + $logProvider.debugEnabled(!IS_PRODUCTION); $compileProvider.debugInfoEnabled(!IS_PRODUCTION); } diff --git a/ui-modules/home/app/index.js b/ui-modules/home/app/index.js index 15d68e2..bb13f73 100644 --- a/ui-modules/home/app/index.js +++ b/ui-modules/home/app/index.js @@ -35,11 +35,12 @@ import mainDeployState from 'views/main/deploy/deploy.controller'; import aboutState from 'views/about/about.controller.js'; angular.module('app', [ngAnimate, ngCookies, uiRouter, brCore, brServerStatus, brIconGenerator, brInterstitialSpinner, brooklynModuleLinks, brooklynUserManagement, brooklynQuickLaunch, mainState, mainDeployState, aboutState]) - .config(['$urlRouterProvider', '$logProvider', applicationConfig]) + .config(['$urlRouterProvider', '$logProvider', '$compileProvider', applicationConfig]) .run(['$http', httpConfig]); -function applicationConfig($urlRouterProvider, $logProvider) { - $logProvider.debugEnabled(false); +function applicationConfig($urlRouterProvider, $logProvider, $compileProvider) { + $logProvider.debugEnabled(!IS_PRODUCTION); + $compileProvider.debugInfoEnabled(!IS_PRODUCTION); $urlRouterProvider.otherwise('/'); } diff --git a/ui-modules/location-manager/app/index.js b/ui-modules/location-manager/app/index.js index 429f9a4..3af9207 100644 --- a/ui-modules/location-manager/app/index.js +++ b/ui-modules/location-manager/app/index.js @@ -38,13 +38,16 @@ import wizardAdvancedState from 'views/wizard/advanced/advanced.controller'; import wizardByonState from 'views/wizard/byon/byon.controller'; import wizardCloudState from 'views/wizard/cloud/cloud.controller'; +const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false; + angular.module('app', [ngAnimate, ngCookies, uiRouter, brCore, brServerStatus, brAutoFocus, brInterstitialSpinner, brooklynModuleLinks, brSensitiveField, brooklynUserManagement, brooklynApi, locationsState, detailState, wizardState, wizardAdvancedState, wizardByonState, wizardCloudState]) - .config(['$urlRouterProvider', '$logProvider', applicationConfig]) + .config(['$urlRouterProvider', '$logProvider', '$compileProvider', applicationConfig]) .run(['$rootScope', '$state', 'brSnackbar', errorHandler]) .run(['$http', httpConfig]); -function applicationConfig($urlRouterProvider, $logProvider) { - $logProvider.debugEnabled(false); +function applicationConfig($urlRouterProvider, $logProvider, $compileProvider) { + $logProvider.debugEnabled(!IS_PRODUCTION); + $compileProvider.debugInfoEnabled(!IS_PRODUCTION); $urlRouterProvider.otherwise('/'); } diff --git a/ui-modules/logout/app/index.js b/ui-modules/logout/app/index.js index e5d4d15..fe6e74d 100644 --- a/ui-modules/logout/app/index.js +++ b/ui-modules/logout/app/index.js @@ -30,12 +30,15 @@ import brServerStatus from 'brooklyn-ui-utils/server-status/server-status'; import mainState from './views/main/main.controller'; +const IS_PRODUCTION = process.env.NODE_ENV === 'production' || false; + angular.module('app', [ngAnimate, ngCookies, uiRouter, brCore, brInterstitialSpinner, brServerStatus, brooklynModuleLinks, brooklynUserManagement, mainState]) - .config(['$urlRouterProvider', '$logProvider', applicationConfig]) + .config(['$urlRouterProvider', '$logProvider', '$compileProvider', applicationConfig]) .run(['$http', httpConfig]); -function applicationConfig($urlRouterProvider, $logProvider) { - $logProvider.debugEnabled(false); +function applicationConfig($urlRouterProvider, $logProvider, $compileProvider) { + $logProvider.debugEnabled(!IS_PRODUCTION); + $compileProvider.debugInfoEnabled(!IS_PRODUCTION); $urlRouterProvider.otherwise('/'); }
