Skip to content

Commit d9af9df

Browse files
committed
Update callbacks and ServerClosed test
1 parent 624d801 commit d9af9df

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/phongo_apm.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,8 @@ static void phongo_apm_server_closed(const mongoc_apm_server_closed_t* event)
317317
p_event = Z_SERVERCLOSEDEVENT_OBJ_P(&z_event);
318318

319319
host_list = mongoc_apm_server_closed_get_host(event);
320-
memcpy(&p_event->host, &host_list->host, BSON_HOST_NAME_MAX + 1);
320+
memset(p_event->host, 0, sizeof(p_event->host));
321+
bson_strncpy(p_event->host, host_list->host, sizeof(p_event->host));
321322
p_event->port = host_list->port;
322323

323324
mongoc_apm_server_closed_get_topology_id(event, &p_event->topology_id);
@@ -350,7 +351,8 @@ static void phongo_apm_server_opening(const mongoc_apm_server_opening_t* event)
350351
p_event = Z_SERVEROPENINGEVENT_OBJ_P(&z_event);
351352

352353
host_list = mongoc_apm_server_opening_get_host(event);
353-
memcpy(&p_event->host, &host_list->host, BSON_HOST_NAME_MAX + 1);
354+
memset(p_event->host, 0, sizeof(p_event->host));
355+
bson_strncpy(p_event->host, host_list->host, sizeof(p_event->host));
354356
p_event->port = host_list->port;
355357

356358
mongoc_apm_server_opening_get_topology_id(event, &p_event->topology_id);

tests/apm/monitoring-serverClosed-001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ MongoDB\Driver\Monitoring\ServerClosedEvent
77
<?php
88
require_once __DIR__ . "/../utils/basic.inc";
99

10-
$m = create_test_manager();
10+
$m = create_test_manager(URI, [], ['disableClientPersistence' => true]);
1111

1212
class MySubscriber implements MongoDB\Driver\Monitoring\SDAMSubscriber
1313
{
@@ -35,7 +35,7 @@ class MySubscriber implements MongoDB\Driver\Monitoring\SDAMSubscriber
3535
}
3636

3737
$subscriber = new MySubscriber;
38-
MongoDB\Driver\Monitoring\addSubscriber($subscriber);
38+
$m->addSubscriber($subscriber);
3939

4040
$command = new MongoDB\Driver\Command(['ping' => 1]);
4141
$m->executeCommand(DATABASE_NAME, $command);

0 commit comments

Comments
 (0)