From 2280594d422cbaa90362105afe695629115ebf8b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 31 Aug 2016 02:21:04 +0000 Subject: admin: map unset reject_bad_md5 field to nil The 'reject_bad_md5' field may be of an unknown value before the monitor is ready, so prepare for it and map it to 'nil' instead of an empty string. This hopefully makes the Ruby API more Ruby-ish. --- lib/mogilefs/admin.rb | 2 ++ test/fresh.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/mogilefs/admin.rb b/lib/mogilefs/admin.rb index 289dea6..96a7898 100644 --- a/lib/mogilefs/admin.rb +++ b/lib/mogilefs/admin.rb @@ -82,6 +82,8 @@ class MogileFS::Admin < MogileFS::Client row["reject_bad_md5"] = true when "0" row["reject_bad_md5"] = false + when "" + row["reject_bad_md5"] = nil end end end diff --git a/test/fresh.rb b/test/fresh.rb index 8d452c7..4c53ac2 100644 --- a/test/fresh.rb +++ b/test/fresh.rb @@ -82,7 +82,7 @@ EOF # MogileFS::Server 2.60+ shows reject_bad_md5 monitor status dev = @admin.get_devices[0] if dev.include?("reject_bad_md5") - assert [true, false].include?(dev["reject_bad_md5"]) + assert [true, false, nil].include?(dev["reject_bad_md5"]), dev.inspect end out = err = nil -- cgit v1.2.3-24-ge0c7