Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cpp: Fix incorrect exception being caught, fix docker warnings #796

Merged
merged 4 commits into from
Jul 30, 2024
Merged

Cpp: Fix incorrect exception being caught, fix docker warnings #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6b4bce
cpp: Fix wrong exception being called
achim-k Jul 29, 2024
42127a0
bump conan recipe version
achim-k Jul 29, 2024
a447c50
Revert "bump conan recipe version"
achim-k Jul 29, 2024
1283395
Fix dockerfile warnings
achim-k Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cpp/dev.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ ENV CXX=clang++

WORKDIR /src

FROM base as build
FROM base AS build
RUN pip --no-cache-dir install conan
RUN conan profile detect --force
COPY ./foxglove-websocket /src/foxglove-websocket/
ARG CPPSTD=17
ARG ASIO=standalone
RUN conan create foxglove-websocket -s compiler.cppstd=$CPPSTD --build=missing -o foxglove-websocket*:asio=$ASIO

FROM build as build_examples
FROM build AS build_examples
COPY --from=build /root/.conan2 /root/.conan2
COPY ./examples /src/examples
RUN conan build examples --output-folder examples/ -s compiler.cppstd=$CPPSTD --build=missing
Expand Down
4 changes: 2 additions & 2 deletions cpp/foxglove-websocket/include/foxglove/websocket/websocket_server.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,10 +769,10 @@ inline void Server<ServerConfiguration>::handleBinaryMessage(ConnHandle hdl, Mes
length,
data};
_handlers.clientMessageHandler(clientMessage, hdl);
} catch (const ServiceError& e) {
} catch (const ClientChannelError& e) {
sendStatusAndLogMsg(hdl, StatusLevel::Error, e.what());
} catch (...) {
sendStatusAndLogMsg(hdl, StatusLevel::Error, "callService: Failed to execute handler");
sendStatusAndLogMsg(hdl, StatusLevel::Error, "clientPublish: Failed to execute handler");
}
} break;
case ClientBinaryOpcode::SERVICE_CALL_REQUEST: {
Expand Down
Loading