mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'release/0.4.3'

Browse Source
This commit is contained in:
Walter Dal Mut
2015-06-13 11:24:27 +02:00
parent b35c4d1f53 b2f044f154
commit 799b523776
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
0.4.2
0.4.3
src/Adapter/UdpAdapter.php
+1 -2
View File
@@ -28,8 +28,7 @@ final class UdpAdapter extends AdapterAbstract
$tags = array_replace_recursive($tags, $message["tags"]);
}
$now = new DateTime();
$unixepoch = (int)($now->format("U") * 1e9);
$unixepoch = (int)(microtime(true) * 1e9);
if (array_key_exists("time", $message)) {
$dt = new DateTime($message["time"]);
$unixepoch = (int)($dt->format("U") * 1e9);
tests/ClientTest.php
+3 -5
View File
@@ -2,6 +2,7 @@
namespace InfluxDB;
use DateTime;
use DateTimeZone;
use InfluxDB\Adapter\GuzzleAdapter as InfluxHttpAdapter;
use InfluxDB\Options;
use InfluxDB\Adapter\UdpAdapter;
@@ -165,11 +166,8 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$object = $this->createClientWithUdpAdapter();
$object->mark("udp.test", ["mark" => "element"]);
sleep(1);
$object->mark("udp.test", ["mark" => "element1"]);
sleep(1);
$object->mark("udp.test", ["mark" => "element2"]);
sleep(1);
$object->mark("udp.test", ["mark" => "element3"]);
// Wait UDP/IP message arrives
@@ -278,8 +276,8 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$this->assertCount(1, $body["results"][0]["series"][0]["values"]);
$this->assertEquals("time", $body["results"][0]["series"][0]["columns"][0]);
$saved = new DateTime($body["results"][0]["series"][0]["values"][0][0]);
$this->assertEquals(date("Y-m-d"), $saved->format("Y-m-d"));
$saved = $body["results"][0]["series"][0]["values"][0][0];
$this->assertRegExp("/".date("Y-m-d")."/i", $saved);
}
/**