From 0081fb03752521e17b52fe0929e9bd1cd11bfce7 Mon Sep 17 00:00:00 2001
From: Peter Goldstein <peter@valimail.com>
Date: Sat, 16 Mar 2019 15:35:02 -0700
Subject: [PATCH] Log over max size as an error, rather than a warning

---
 lib/dalli/server.rb |  2 +-
 test/helper.rb      | 10 ++++++++++
 test/test_dalli.rb  | 14 +++++++-------
 test/test_server.rb |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/lib/dalli/server.rb b/lib/dalli/server.rb
index 7aae5174..542d6cf8 100644
--- a/lib/dalli/server.rb
+++ b/lib/dalli/server.rb
@@ -477,7 +477,7 @@ def guard_max_value(key, value)
         message = "Value for #{key} over max size: #{@options[:value_max_bytes]} <= #{value.bytesize}"
         raise Dalli::ValueOverMaxSize, message if @options[:error_when_over_max_size]
 
-        Dalli.logger.warn message
+        Dalli.logger.error "#{message} - this value may be truncated by memcached"
         false
       end
     end
diff --git a/test/helper.rb b/test/helper.rb
index 98163ce1..27f0b1e2 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -60,4 +60,14 @@ def with_connectionpool
     require 'connection_pool'
     yield
   end
+
+  def with_nil_logger
+    old = Dalli.logger
+    Dalli.logger = Logger.new(nil)
+    begin
+      yield
+    ensure
+      Dalli.logger = old
+    end
+  end
 end
diff --git a/test/test_dalli.rb b/test/test_dalli.rb
index 0d368773..d5a3dfe5 100644
--- a/test/test_dalli.rb
+++ b/test/test_dalli.rb
@@ -120,7 +120,9 @@
         dc.flush
 
         val1 = "1234567890"*105000
-        assert_equal false, dc.set('a', val1)
+        with_nil_logger do
+          assert_equal false, dc.set('a', val1)
+        end
 
         val1 = "1234567890"*100000
         dc.set('a', val1)
@@ -698,12 +700,8 @@
 
     it "handle application marshalling issues" do
       memcached_persistent do |dc|
-        old = Dalli.logger
-        Dalli.logger = Logger.new(nil)
-        begin
+        with_nil_logger do
           assert_equal false, dc.set('a', Proc.new { true })
-        ensure
-          Dalli.logger = old
         end
       end
     end
@@ -714,7 +712,9 @@
           dalli = Dalli::Client.new(dc.instance_variable_get(:@servers), :compress => true)
 
           value = "0"*1024*1024
-          assert_equal false, dc.set('verylarge', value)
+          with_nil_logger do
+            assert_equal false, dc.set('verylarge', value)
+          end
           dalli.set('verylarge', value)
         end
       end
diff --git a/test/test_server.rb b/test/test_server.rb
index 4784b191..c717ce64 100644
--- a/test/test_server.rb
+++ b/test/test_server.rb
@@ -132,7 +132,7 @@
       s = Dalli::Server.new('127.0.0.1')
       value = OpenStruct.new(:bytesize => 1_048_577)
 
-      Dalli.logger.expects(:warn).once.with("Value for foo over max size: 1048576 <= 1048577")
+      Dalli.logger.expects(:error).once.with("Value for foo over max size: 1048576 <= 1048577 - this value may be truncated by memcached")
 
       s.send(:guard_max_value, :foo, value)
     end