From 36e209de8e7d164212b47c8c6f9e2321a8c25683 Mon Sep 17 00:00:00 2001 From: Chris Bradley Date: Tue, 3 Sep 2024 13:23:33 +0100 Subject: [PATCH] Facilitate use of eckit resource config file --- src/gribjump/remote/WorkQueue.cc | 4 ++-- src/tools/gribjump-server.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gribjump/remote/WorkQueue.cc b/src/gribjump/remote/WorkQueue.cc index abb6d20..5a5dd36 100644 --- a/src/gribjump/remote/WorkQueue.cc +++ b/src/gribjump/remote/WorkQueue.cc @@ -33,8 +33,8 @@ WorkQueue::~WorkQueue() { } -WorkQueue::WorkQueue() : queue_(eckit::Resource("$GRIBJUMP_QUEUESIZE", 1024)) { - int nthreads = eckit::Resource("$GRIBJUMP_THREADS", LibGribJump::instance().config().getInt("threads", 1)); +WorkQueue::WorkQueue() : queue_(eckit::Resource("$GRIBJUMP_QUEUESIZE;gribjumpQueueSize", 1024)) { + int nthreads = eckit::Resource("$GRIBJUMP_THREADS;gribjumpThreads", LibGribJump::instance().config().getInt("threads", 1)); eckit::Log::info() << "Starting " << eckit::Plural(nthreads, "thread") << std::endl; for (int i = 0; i < nthreads; ++i) { workers_.emplace_back([this] { diff --git a/src/tools/gribjump-server.cc b/src/tools/gribjump-server.cc index 80b5102..349ce78 100644 --- a/src/tools/gribjump-server.cc +++ b/src/tools/gribjump-server.cc @@ -26,7 +26,7 @@ class GribJumpServerApp : public eckit::Application, public GribJumpServer { Application(argc, argv), GribJumpServer(eckit::net::Port( "gribJumpServer", - eckit::Resource("$GRIBJUMP_SERVER_PORT", LibGribJump::instance().config().getInt("server.port", 9777) + eckit::Resource("$GRIBJUMP_SERVER_PORT;gribjumpServerPort", LibGribJump::instance().config().getInt("server.port", 9777) ))) {}