Much better cleanup, still fast B)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/server/main.zig b/src/server/main.zig
index aad842c..fca0dee 100644
--- a/src/server/main.zig
+++ b/src/server/main.zig
@@ -233,12 +233,12 @@ fn publishMessage(server: *Server, io: std.Io, alloc: std.mem.Allocator, source_
                 std.debug.print("trying to publish to a client that no longer exists: {d}\n", .{subscription.client_id});
                 continue;
             };
-            client.send(io, .{ .msg = .{
-                .subject = try alloc.dupe(u8, msg.subject),
-                .sid = try alloc.dupe(u8, subscription.sid),
-                .reply_to = if (msg.reply_to) |r| try alloc.dupe(u8, r) else null,
-                .payload = try alloc.dupe(u8, msg.payload),
-            } }) catch continue;
+            client.send(io, .{
+                .msg = try msg.toMsg(alloc, subscription.sid),
+            }) catch |err| switch (err) {
+                error.Canceled => return err,
+                else => {},
+            };
         }
     }
     if (source_client.connect) |c| {