Skip to content

Commit

Permalink
Merge branch 'release/0.7.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisspyB committed Nov 14, 2024
2 parents a032b16 + 055d84c commit aa8ca7b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.0
0.7.1
4 changes: 2 additions & 2 deletions src/gribjump/remote/GribJumpUser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void GribJumpUser::handle_client(eckit::Stream& s, eckit::Timer& timer) {

s >> version;
if (version != remoteProtocolVersion) {
throw eckit::SeriousBug("Gribjump remote-protocol mismatch: Serverside version: " + std::to_string(protocolVersion_) + ", Clientside version: " + std::to_string(version));
throw eckit::SeriousBug("Gribjump remote-protocol mismatch: Serverside version: " + std::to_string(remoteProtocolVersion) + ", Clientside version: " + std::to_string(version));
}

LogContext ctx(s);
Expand Down Expand Up @@ -90,7 +90,7 @@ void GribJumpUser::handle_client(eckit::Stream& s, eckit::Timer& timer) {

template <typename RequestType>
void GribJumpUser::processRequest(eckit::Stream& s) {
eckit::Timer timer;
eckit::Timer timer("GribJumpUser::processRequest");

RequestType request(s);
MetricsManager::instance().set("elapsed_receive", timer.elapsed());
Expand Down
1 change: 0 additions & 1 deletion src/gribjump/remote/GribJumpUser.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class GribJumpUser : public eckit::net::NetUser {

private: // members

constexpr static uint16_t protocolVersion_ = 0;
};

//----------------------------------------------------------------------------------------------------------------------
Expand Down

0 comments on commit aa8ca7b

Please sign in to comment.