Merge pull request #20 from uShip/MAX/707-fix-count-subkey

MAX-707: Fix count subkey

src/uShip.Logging.Tests/LoggerTests.cs

@@ -137,6 +137,22 @@ public void should_format_message_properly_for_graphite_counter_with_subkey()
             log.Received().Info(expectedValue);
         }
 
+        [Test]
+        public void should_format_message_properly_for_count_method_with_subkey()
+        {
+            var logFactory = Substitute.For<LogFactory>();
+            var log = Substitute.For<ILog>();
+            logFactory.Create(ConfiguredLogger.Graphite).Returns(log);
+
+            var logger = new Logger(logFactory, Substitute.For<LoggingEventDataBuilder>());
+            logger.Count(GraphiteKey.Test.Key, "SubKey", 1);
+
+            var hostName = Environment.MachineName;
+            var expectedValue = String.Format("graphite.test.Test.SubKey~source={0}:1|c", hostName);
+
+            log.Received().Info(expectedValue);
+        }
+
         [Test]
         public void should_format_message_properly_for_graphite_counter_with_subkey_with_tags()
         {

src/uShip.Logging/LogBuilders/Logger.cs

@@ -103,7 +103,7 @@ public void Count(string key, int count, Dictionary<string, string> tags = null)
 
         public void Count(string key, string subkey, int count, Dictionary<string, string> tags = null)
         {
-            var message = FormatGraphiteMessage(key, null, null, count, tags);
+            var message = FormatGraphiteMessage(key, subkey, null, count, tags);
             _graphiteLog.Info(message);
         }