From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 560CC2035F for ; Wed, 31 Aug 2016 02:50:47 +0000 (UTC) From: Eric Wong To: mogilefs-client-public@bogomips.org Subject: [PATCH 2/6] admin: map unset reject_bad_md5 field to nil Date: Wed, 31 Aug 2016 02:50:42 +0000 Message-Id: <20160831025046.24153-3-e@80x24.org> In-Reply-To: <20160831025046.24153-1-e@80x24.org> References: <20160831025046.24153-1-e@80x24.org> List-Id: 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 @@ def get_devices(devid = nil) 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 @@ def add_host_device_domain # 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 -- EW