diff --git a/lib/dump_stat.rb b/lib/dump_stat.rb index 20c58629237c894ff546e1070b278d3a3f13a70e..c7507d8d9a04231794e02c14a0647c0361b7e8b4 100644 --- a/lib/dump_stat.rb +++ b/lib/dump_stat.rb @@ -85,7 +85,7 @@ module DumpStat # keep message | log line which key end with .message|.log def self.assign_log_message(key, value) - if key.starts_with?('msg.', 'log.', 'element.') || + if key.start_with?('msg.', 'log.', 'element.') || key.end_with?('.message', '.log', '.element') k = @monitor + '.' + key @result[k] = value diff --git a/src/create_job_cpio.cr b/src/create_job_cpio.cr index db21e2a78cf23c3c0a8ee56efc705c9777af4b91..ab1b6883cf013e1f6dbb138867af574fea0663f8 100644 --- a/src/create_job_cpio.cr +++ b/src/create_job_cpio.cr @@ -46,8 +46,8 @@ require "./lib/jobfile_operate" class JobHash def generate_shell_script - generate_shell_vars + - generate_shell_run + result = generate_shell_vars + generate_shell_run + result end def generate_shell_run @@ -108,8 +108,8 @@ class JobHash private def process_section(str, section) return unless entries = @hash_hhh[section]? - entries.each do |program, config| + config = {} of String => String if config.nil? next unless config.is_a?(Hash) # Handle pre-script