Add some options to logger and use it in some places

pull/2144/head
Rodrigo Nascimento 10 years ago
parent 6b8aed6725
commit 04f013034a
  1. 6
      packages/meteor-accounts-saml/saml_rocketchat.coffee
  2. 6
      packages/rocketchat-lib/server/startup/oAuthServicesUpdate.coffee
  3. 1
      packages/rocketchat-logger/package.js
  4. 19
      packages/rocketchat-logger/server.coffee
  5. 7
      packages/rocketchat-theme/server/server.coffee

@ -1,3 +1,7 @@
logger = new Logger 'steffo:meteor-accounts-saml',
methods:
updated: 'log'
RocketChat.settings.addGroup 'SAML'
Meteor.methods
addSamlService: (name) ->
@ -21,7 +25,7 @@ updateServices = ->
Accounts.saml.settings.providers = []
for service in services
console.log "Updating login service #{service._id}".blue
logger.updated service._id
serviceName = 'saml'

@ -1,3 +1,7 @@
logger = new Logger 'rocketchat:lib',
methods:
oauth_updated: 'log'
timer = undefined
oAuthServicesUpdate = ->
Meteor.clearTimeout timer if timer?
@ -5,7 +9,7 @@ oAuthServicesUpdate = ->
timer = Meteor.setTimeout ->
services = RocketChat.models.Settings.find({_id: /^(Accounts_OAuth_|Accounts_OAuth_Custom_)[a-z_-]+$/i}).fetch()
for service in services
console.log "Updating login service #{service._id}".blue
logger.oauth_updated service._id
serviceName = service._id.replace('Accounts_OAuth_', '')

@ -9,6 +9,7 @@ Package.onUse(function(api) {
api.versionsFrom('1.0');
api.use('coffeescript');
api.use('underscore');
api.use('logging');
api.use('nooitaf:colors');
api.use('templating', 'client', {weak: true});

@ -1,5 +1,7 @@
LoggerManager = new class
loggers: {}
showPackage: false
showFileAndLine: false
@Logger = class Logger
defaultTypes:
@ -7,7 +9,11 @@ LoggerManager = new class
warn: 'magenta'
error: 'red'
constructor: (@name, @config={}) ->
config: {}
constructor: (@name, config={}) ->
_.extend @config, config
if LoggerManager.loggers[@name]?
LoggerManager.loggers[@name].warn 'Duplicated instance'
return LoggerManager.loggers[@name]
@ -40,16 +46,19 @@ LoggerManager = new class
prefix = ""
if options.method?
prefix = "[#{@name}->#{options.method}]"
prefix = "[#{@name} #{options.method}]"
else
prefix = "[#{@name}]"
details = @_getCallerDetails()
detailParts = []
if details.package? then detailParts.push details.package
if details.file? then detailParts.push details.file
if details.line? then detailParts.push details.line
if details.package? and LoggerManager.showPackage is true
detailParts.push details.package
if details.file? and LoggerManager.showFileAndLine is true
detailParts.push details.file
if details.line? and LoggerManager.showFileAndLine is true
detailParts.push details.line
if detailParts.length > 0
prefix = "(#{detailParts.join(':')})#{prefix}"

@ -2,6 +2,11 @@ less = Npm.require('less')
autoprefixer = Npm.require('less-plugin-autoprefix')
crypto = Npm.require('crypto')
logger = new Logger 'rocketchat:theme',
methods:
stop_rendering: 'log'
calculateClientHash = WebAppHashing.calculateClientHash
WebAppHashing.calculateClientHash = (manifest, includeFilter, runtimeConfigOverride) ->
css = RocketChat.theme.getCss()
@ -87,7 +92,7 @@ RocketChat.theme = new class
start = Date.now()
less.render content, options, (err, data) ->
console.log 'stop rendering', Date.now() - start
logger.stop_rendering Date.now() - start
if err?
return console.log err

Loading…
Cancel
Save