about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-08-31 02:21:04 +0000
committerEric Wong <e@80x24.org>2016-08-31 02:48:17 +0000
commit2280594d422cbaa90362105afe695629115ebf8b (patch)
tree1c892b2556dc0dc79fe23260e0912de06b770040
parent8ef97c54d0e2aa762c75301790f4cd02fc851f0e (diff)
downloadmogilefs-client-2280594d422cbaa90362105afe695629115ebf8b.tar.gz
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.
-rw-r--r--lib/mogilefs/admin.rb2
-rw-r--r--test/fresh.rb2
2 files changed, 3 insertions, 1 deletions
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