On Fri, Oct 16, 2020 at 11:19:09AM +0800, Luan Shengde wrote:

On Fri, Oct 16, 2020 at 11:13:19AM +0800, Tong Qunfeng wrote:

...

when use job.update with same id, that's equal no update to id. remove the log "Should not direct update id, use update_id, ignore this"

and fix another 1 crystal-format, 1 log message.

Signed-off-by: Tong Qunfeng taxcom@tom.com

src/lib/job.cr | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/lib/job.cr b/src/lib/job.cr index 32aa662..ffe3749 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -108,12 +108,13 @@ class Job

def update(hash : Hash) hash_dup = hash.dup

• if hash_dup.has_key?("id")

•  hash_dup.delete("id")
  

•  puts "Should not direct update id, use update_id, ignore this"
  

• end
• if hash_dup.has_key?("tbox_group")

•  raise "Should not direct update tbox_group, use update_tbox_group"
  

• ["id", "tbox_group"].each do |key|

•  if hash_dup.has_key?(key)
  

•    if "#{hash_dup[key]}" != "#{@hash[key]}"
  

above line => unless hash_dup[key] == @hash[key]

good point.

Thanks Luan Shengde

...

•      raise "Should not direct update #{key}, use update_#{key}"
  

•    end
  

•    hash_dup.delete(key)
  

•  end
  

  end

  @hash.any_merge!(hash_dup)

@@ -205,7 +206,7 @@ class Job

def []=(key : String, value : String | Nil) if key == "id" || key == "tbox_group"

•  raise "Should not []= id and tbox_group, use update_#{key}"
  

•  raise "Should not use []= update #{key}, use update_#{key}"
  

  end @hash[key] = JSON::Any.new(value) if value end

@@ -388,7 +389,7 @@ class Job program_params = @hash["pp"].as_h program_params.keys.each do |program| deps_dest_file = "#{SRV_INITRD}/deps/#{mount_type}/#{os_dir}/#{program}.cgz"

•    pkg_dest_file  = "#{SRV_INITRD}/pkg/#{mount_type}/#{os_dir}/#{program}.cgz"
  

•    pkg_dest_file = "#{SRV_INITRD}/pkg/#{mount_type}/#{os_dir}/#{program}.cgz"
    if File.exists?("#{ENV["LKP_SRC"]}/distro/depends/#{program}") && File.exists?(deps_dest_file)
      initrd_deps_arr << "#{initrd_http_prefix}" + JobHelper.service_path(deps_dest_file)
    end
  

-- 2.23.0