mirror of https://github.com/BTCPrivate/copay.git
Adding a way to set the log level from the UI
This commit is contained in:
parent
f586ecf708
commit
7cc6e335a7
1
copay.js
1
copay.js
|
@ -6,6 +6,7 @@ module.exports.PrivateKey = require('./js/models/PrivateKey');
|
|||
module.exports.HDPath = require('./js/models/HDPath');
|
||||
module.exports.HDParams = require('./js/models/HDParams');
|
||||
module.exports.crypto = require('./js/util/crypto');
|
||||
module.exports.logger = require('./js/log');
|
||||
|
||||
|
||||
// components
|
||||
|
|
|
@ -1,32 +1,28 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('copayApp.controllers').controller('SettingsController', function($scope, $rootScope, $window, $location, controllerUtils, notification) {
|
||||
|
||||
|
||||
controllerUtils.redirIfLogged();
|
||||
|
||||
|
||||
|
||||
|
||||
$scope.title = 'Settings';
|
||||
$scope.defaultLanguage = config.defaultLanguage || 'en';
|
||||
$scope.insightLivenet = config.network.livenet.url;
|
||||
$scope.insightTestnet = config.network.testnet.url;
|
||||
$scope.defaultLogLevel = config.logLevel || 'log';
|
||||
|
||||
var logLevels = copay.logger.getLevels();
|
||||
|
||||
$scope.availableLogLevels = [];
|
||||
|
||||
|
||||
//$scope.availableLogLevels = logger.levels;
|
||||
|
||||
$scope.availableLogLevels = {
|
||||
'debug': 0,
|
||||
'info': 1,
|
||||
'log': 2,
|
||||
'warn': 3,
|
||||
'error': 4,
|
||||
'fatal': 5
|
||||
};
|
||||
|
||||
console.log($scope.defaultLogLevel);
|
||||
console.log($scope.availableLogLevels);
|
||||
|
||||
for (var key in $scope.availableLogLevels) {
|
||||
console.log("Ele " + key + " -- " + $scope.availableLogLevels[key])
|
||||
for (var key in logLevels) {
|
||||
$scope.availableLogLevels.push({
|
||||
'name': key
|
||||
});
|
||||
}
|
||||
|
||||
$scope.availableStorages = [{
|
||||
|
@ -63,7 +59,7 @@ angular.module('copayApp.controllers').controller('SettingsController', function
|
|||
}
|
||||
|
||||
for (var ii in $scope.availableLogLevels) {
|
||||
if ($scope.defaultLogLevel === $scope.availableLogLevels[ii]) {
|
||||
if ($scope.defaultLogLevel === $scope.availableLogLevels[ii].name) {
|
||||
$scope.selectedLogLevel = $scope.availableLogLevels[ii];
|
||||
break;
|
||||
}
|
||||
|
@ -84,17 +80,17 @@ angular.module('copayApp.controllers').controller('SettingsController', function
|
|||
},
|
||||
}
|
||||
|
||||
|
||||
var plugins = {};
|
||||
plugins[$scope.selectedStorage.pluginName] = true;
|
||||
|
||||
logger.setLevel($scope.selectedLogLevel);
|
||||
copay.logger.setLevel($scope.selectedLogLevel.name);
|
||||
|
||||
localStorage.setItem('config', JSON.stringify({
|
||||
network: insightSettings,
|
||||
version: copay.version,
|
||||
defaultLanguage: $scope.selectedLanguage.isoCode,
|
||||
plugins: plugins,
|
||||
logLevel: $scope.selectedLogLevel,
|
||||
logLevel: $scope.selectedLogLevel.name,
|
||||
}));
|
||||
|
||||
// Go home reloading the application
|
||||
|
|
19
js/log.js
19
js/log.js
|
@ -1,6 +1,7 @@
|
|||
var config = require('../config');
|
||||
var config = config || require('../config');
|
||||
var _ = require('lodash');
|
||||
|
||||
|
||||
/**
|
||||
* @desc
|
||||
* A simple logger that wraps the <tt>console.log</tt> methods when available.
|
||||
|
@ -22,6 +23,10 @@ var Logger = function(name) {
|
|||
this.level = 2;
|
||||
};
|
||||
|
||||
Logger.prototype.getLevels = function() {
|
||||
return levels;
|
||||
};
|
||||
|
||||
|
||||
var levels = {
|
||||
'debug': 0,
|
||||
|
@ -112,5 +117,15 @@ Logger.prototype.setLevel = function(level) {
|
|||
*/
|
||||
|
||||
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;
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
</div>
|
||||
</fieldset>
|
||||
<legend translate>Log level</legend>
|
||||
<select class="form-control" ng-model="selectedLogLevel" ng-options="o for o in availableLogLevels" required>
|
||||
<select class="form-control" ng-model="selectedLogLevel" ng-options="o.name for o in availableLogLevels" required>
|
||||
</select>
|
||||
</fieldset>
|
||||
<button translate type="submit" class="button primary radius expand m0" ng-disabled="settingsForm.$invalid || loading" ng-click="save()">
|
||||
|
|
Loading…
Reference in New Issue