Merge pull request #1614 from matiaspando/feature/addLogLevelSettings

Feature/add log level settings
This commit is contained in:
Matias Alejo Garcia 2014-10-30 17:38:50 -03:00
commit 6715d776c0
4 changed files with 64 additions and 14 deletions

View File

@ -6,6 +6,7 @@ module.exports.PrivateKey = require('./js/models/PrivateKey');
module.exports.HDPath = require('./js/models/HDPath'); module.exports.HDPath = require('./js/models/HDPath');
module.exports.HDParams = require('./js/models/HDParams'); module.exports.HDParams = require('./js/models/HDParams');
module.exports.crypto = require('./js/util/crypto'); module.exports.crypto = require('./js/util/crypto');
module.exports.logger = require('./js/log');
// components // components

View File

@ -1,12 +1,29 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('SettingsController', function($scope, $rootScope, $window, $location, controllerUtils, notification) { angular.module('copayApp.controllers').controller('SettingsController', function($scope, $rootScope, $window, $location, controllerUtils, notification) {
controllerUtils.redirIfLogged(); controllerUtils.redirIfLogged();
$scope.title = 'Settings'; $scope.title = 'Settings';
$scope.defaultLanguage = config.defaultLanguage || 'en'; $scope.defaultLanguage = config.defaultLanguage || 'en';
$scope.insightLivenet = config.network.livenet.url; $scope.insightLivenet = config.network.livenet.url;
$scope.insightTestnet = config.network.testnet.url; $scope.insightTestnet = config.network.testnet.url;
$scope.defaultLogLevel = config.logLevel || 'log';
var logLevels = copay.logger.getLevels();
$scope.availableLogLevels = [];
for (var key in logLevels) {
$scope.availableLogLevels.push({
'name': key
});
}
$scope.availableStorages = [{ $scope.availableStorages = [{
name: 'Insight', name: 'Insight',
@ -21,7 +38,7 @@ angular.module('copayApp.controllers').controller('SettingsController', function
// } // }
]; ];
_.each($scope.availableStorages, function(v){ _.each($scope.availableStorages, function(v) {
if (config.plugins[v.pluginName]) if (config.plugins[v.pluginName])
$scope.selectedStorage = v; $scope.selectedStorage = v;
}); });
@ -41,6 +58,13 @@ angular.module('copayApp.controllers').controller('SettingsController', function
} }
} }
for (var ii in $scope.availableLogLevels) {
if ($scope.defaultLogLevel === $scope.availableLogLevels[ii].name) {
$scope.selectedLogLevel = $scope.availableLogLevels[ii];
break;
}
}
$scope.save = function() { $scope.save = function() {
$scope.insightLivenet = copay.Insight.setCompleteUrl($scope.insightLivenet); $scope.insightLivenet = copay.Insight.setCompleteUrl($scope.insightLivenet);
@ -56,14 +80,17 @@ angular.module('copayApp.controllers').controller('SettingsController', function
}, },
} }
var plugins = {}; var plugins = {};
plugins[$scope.selectedStorage.pluginName] = true; plugins[$scope.selectedStorage.pluginName] = true;
copay.logger.setLevel($scope.selectedLogLevel.name);
localStorage.setItem('config', JSON.stringify({ localStorage.setItem('config', JSON.stringify({
network: insightSettings, network: insightSettings,
version: copay.version, version: copay.version,
defaultLanguage: $scope.selectedLanguage.isoCode, defaultLanguage: $scope.selectedLanguage.isoCode,
plugins: plugins, plugins: plugins,
logLevel: $scope.selectedLogLevel.name,
})); }));
// Go home reloading the application // Go home reloading the application

View File

@ -1,6 +1,7 @@
var config = require('../config'); var config = config || require('../config');
var _ = require('lodash'); var _ = require('lodash');
/** /**
* @desc * @desc
* A simple logger that wraps the <tt>console.log</tt> methods when available. * A simple logger that wraps the <tt>console.log</tt> methods when available.
@ -22,6 +23,10 @@ var Logger = function(name) {
this.level = 2; this.level = 2;
}; };
Logger.prototype.getLevels = function() {
return levels;
};
var levels = { var levels = {
'debug': 0, 'debug': 0,
@ -112,5 +117,15 @@ Logger.prototype.setLevel = function(level) {
*/ */
var logger = new Logger('copay'); var logger = new Logger('copay');
logger.setLevel(config.logLevel); var error = new Error();
var logLevel = config.logLevel;
if (typeof localStorage !== "undefined" && localStorage.getItem) {
var localConfig = JSON.parse(localStorage.getItem("config"));
if (localConfig && localConfig.logLevel)
logLevel = localConfig.logLevel;
}
logger.setLevel(logLevel);
module.exports = logger; module.exports = logger;

View File

@ -35,7 +35,14 @@
Wallets and profiles are stored encrypted using your password as a key. You can store the encrypted data locally, on your platform, or remotely on the Insight Server. <a target="_blank" href="https://github.com/bitpay/copay/tree/master/js/plugins">More pluggins are welcomed!</a> Wallets and profiles are stored encrypted using your password as a key. You can store the encrypted data locally, on your platform, or remotely on the Insight Server. <a target="_blank" href="https://github.com/bitpay/copay/tree/master/js/plugins">More pluggins are welcomed!</a>
</div> </div>
</fieldset> </fieldset>
<fieldset>
<legend translate>Log level</legend>
<select class="form-control" ng-model="selectedLogLevel" ng-options="o.name for o in availableLogLevels" required>
</select>
<div translate class="small">
Log level shows information on the console. This is usefull to find bugs and help users. 'debug' is the most verbose level while 'fatal' only shows unexcpected errors</a>
</div>
</fieldset>
<button translate type="submit" class="button primary radius expand m0" ng-disabled="settingsForm.$invalid || loading" ng-click="save()"> <button translate type="submit" class="button primary radius expand m0" ng-disabled="settingsForm.$invalid || loading" ng-click="save()">
Save Save
</button> </button>