alox-jason 0.0.25 → 0.0.26

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/aloxec/_jason +6 -3
  2. data/aloxec/_log4sh +6 -5
  3. metadata +1 -1
data/aloxec/_jason CHANGED
@@ -33,9 +33,12 @@ function parse_command_line {
33
33
  }
34
34
 
35
35
  function configure_logging {
36
- # load log4sh (disabling properties file warning) and clear the default
37
- # configuration
36
+ if [[ -n "${NO_LOG4SH:-}" ]]; then
37
+ return 0
38
+ fi
39
+
38
40
  LOG4SH_CONFIGURATION=none require _log4sh
41
+
39
42
  log4sh_resetConfiguration
40
43
 
41
44
  # set the global logging level to INFO
@@ -50,7 +53,7 @@ function configure_logging {
50
53
  }
51
54
 
52
55
  function ryaml {
53
- ruby -ryaml -e 'def ps x; unless x.nil?; puts (x.class == String || x.class == Fixnum) ? x : x.to_yaml; end; end; ps ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[acc.class == Array ? key.to_i : key] }' "$@" 2>&-
56
+ ruby -ryaml -e 'def ps x; unless x.nil?; puts (x.class == String || x.class == Fixnum) ? x : x.to_yaml; end; end; ps ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[acc.class == Array ? key.to_i : (m = key.match(/^:(.*)$/); m ? m[1].to_sym : key)] }' "$@" 2>&-
54
57
  }
55
58
 
56
59
  function random_str {
data/aloxec/_log4sh CHANGED
@@ -3822,11 +3822,12 @@ else
3822
3822
 
3823
3823
  # note: not using the constant variables here (e.g. for ConsoleAppender) so
3824
3824
  # that those perusing the code can have a working example
3825
- logger_setLevel ${__LOG4SH_LEVEL_ERROR_STR}
3826
- logger_addAppender stdout
3827
- appender_setType stdout ConsoleAppender
3828
- appender_setLayout stdout PatternLayout
3829
- appender_setPattern stdout '%-4r [%t] %-5p %c %x - %m%n'
3825
+ logger_setLevel INFO # ${__LOG4SH_LEVEL_ERROR_STR}
3826
+ logger_addAppender stderr
3827
+ appender_setType stderr ConsoleAppender
3828
+ appender_setLayout stderr PatternLayout
3829
+ appender_setPattern stderr '%-5p %c %x - %m%n'
3830
+ appender_activateOptions stderr
3830
3831
  fi
3831
3832
 
3832
3833
  # restore the previous set of shell flags
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alox-jason
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.25
4
+ version: 0.0.26
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: