Merge pull request #17 from hostnet/master

GELFMessage::getAdditional not getting value set by setAdditional
graylog-labs · Feb 14, 2013 · 6e47c56 · 6e47c56
2 parents 9c4affa + d2a2ea5
commit 6e47c56
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/GELFMessage.php b/GELFMessage.php
@@ -221,7 +221,8 @@ public function setAdditional($key, $value) {
      * @return mixed
      */
     public function getAdditional($key) {
-        return isset($this->data["_" . trim($key)]) ? $this->data[$key] : null;
+        $additional_key = "_" . trim($key);
+        return isset($this->data[$additional_key]) ? $this->data[$additional_key] : null;
     }
 
     /**
@@ -246,4 +247,4 @@ public function toArray() {
 
         return $messageAsArray;
     }
-}
+}
diff --git a/tests/GelfMessageTest.php b/tests/GelfMessageTest.php
@@ -35,5 +35,11 @@ public function testGelfMessage()
             $message->toArray()
         );
     }
+
+    public function testAdditionalField() {
+        $message = new GELFMessage();
+        $message->setAdditional("something", "foo");
+        $this->assertEquals("foo", $message->getAdditional("something"));
+    }
 }