diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/src/apps/configproxy-cmd/main.cpp | 4 | ||||
-rw-r--r-- | config/src/apps/getvespaconfig/getconfig.cpp | 2 | ||||
-rw-r--r-- | config/src/apps/pingproxy/pingproxy.cpp | 2 | ||||
-rw-r--r-- | config/src/tests/configagent/configagent.cpp | 78 | ||||
-rw-r--r-- | config/src/tests/configretriever/configretriever.cpp | 4 | ||||
-rw-r--r-- | config/src/tests/frt/frt.cpp | 4 | ||||
-rw-r--r-- | config/src/tests/frtconnectionpool/frtconnectionpool.cpp | 4 | ||||
-rw-r--r-- | config/src/tests/subscription/subscription.cpp | 1 | ||||
-rw-r--r-- | config/src/tests/trace/trace.cpp | 4 | ||||
-rw-r--r-- | config/src/vespa/config/helper/ifetchercallback.h | 5 |
10 files changed, 86 insertions, 22 deletions
diff --git a/config/src/apps/configproxy-cmd/main.cpp b/config/src/apps/configproxy-cmd/main.cpp index 1d5934f2817..fcf2a0ca5d7 100644 --- a/config/src/apps/configproxy-cmd/main.cpp +++ b/config/src/apps/configproxy-cmd/main.cpp @@ -10,8 +10,8 @@ class Application : public FastOS_Application Flags _flags; bool parseOpts(); public: - void usage(); - int Main() override; + void usage(void); + int Main(void) override; Application() : _flags() {} }; diff --git a/config/src/apps/getvespaconfig/getconfig.cpp b/config/src/apps/getvespaconfig/getconfig.cpp index df7bbba48b0..23127b79333 100644 --- a/config/src/apps/getvespaconfig/getconfig.cpp +++ b/config/src/apps/getvespaconfig/getconfig.cpp @@ -32,7 +32,7 @@ public: int usage(); void initRPC(const char *spec); void finiRPC(); - int Main() override; + virtual int Main() override; }; diff --git a/config/src/apps/pingproxy/pingproxy.cpp b/config/src/apps/pingproxy/pingproxy.cpp index ba35892c03c..667d5689691 100644 --- a/config/src/apps/pingproxy/pingproxy.cpp +++ b/config/src/apps/pingproxy/pingproxy.cpp @@ -24,7 +24,7 @@ public: int usage(); void initRPC(const char *spec); void finiRPC(); - int Main() override; + virtual int Main() override; }; diff --git a/config/src/tests/configagent/configagent.cpp b/config/src/tests/configagent/configagent.cpp index 0693c33467d..91b657b42f2 100644 --- a/config/src/tests/configagent/configagent.cpp +++ b/config/src/tests/configagent/configagent.cpp @@ -1,4 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config/config.h> #include <vespa/config/raw/rawsource.h> @@ -18,10 +19,25 @@ public: : _key(key) { } - const ConfigKey & getKey() const override { return _key; } - bool abort() override { return false; } - bool isAborted() const override { return false; } - void setError(int errorCode) override { (void) errorCode; } + const ConfigKey & getKey() const override + { + return _key; + } + + bool abort() override + { + return false; + } + + bool isAborted() const override + { + return false; + } + + void setError(int errorCode) override + { + (void) errorCode; + } const ConfigKey _key; }; @@ -41,15 +57,51 @@ public: _isError(iserror) { } - const ConfigKey& getKey() const override { return _key; } - const ConfigValue & getValue() const override { return _value; } - const ConfigState & getConfigState() const override { return _state; } - bool hasValidResponse() const override { return _valid; } - bool validateResponse() override { return _valid; } - void fill() override { _fillCalled = true; } - vespalib::string errorMessage() const override { return _errorMessage; } - int errorCode() const override { return _errorCode; } - bool isError() const override { return _isError; } + const ConfigKey& getKey() const override + { + return _key; + } + + const ConfigValue & getValue() const override + { + return _value; + } + + const ConfigState & getConfigState() const override + { + return _state; + } + + bool hasValidResponse() const override + { + return _valid; + } + + bool validateResponse() override + { + return _valid; + } + + void fill() override + { + _fillCalled = true; + } + + vespalib::string errorMessage() const override + { + return _errorMessage; + } + + int errorCode() const override + { + return _errorCode; + } + + bool isError() const override + { + return _isError; + } + const Trace & getTrace() const override { return _trace; } const ConfigKey _key; diff --git a/config/src/tests/configretriever/configretriever.cpp b/config/src/tests/configretriever/configretriever.cpp index 8273eee2c73..bb4dda0e10e 100644 --- a/config/src/tests/configretriever/configretriever.cpp +++ b/config/src/tests/configretriever/configretriever.cpp @@ -1,5 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +#include <vespa/fastos/fastos.h> +#include <vespa/log/log.h> +LOG_SETUP("configretriever"); #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/config/config.h> diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp index 0de1908858f..26f95df8f42 100644 --- a/config/src/tests/frt/frt.cpp +++ b/config/src/tests/frt/frt.cpp @@ -1,5 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +#include <vespa/fastos/fastos.h> +#include <vespa/log/log.h> +LOG_SETUP("frt"); #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config/common/iconfigholder.h> #include <vespa/config/common/trace.h> diff --git a/config/src/tests/frtconnectionpool/frtconnectionpool.cpp b/config/src/tests/frtconnectionpool/frtconnectionpool.cpp index b563ea1929b..96dad86a54d 100644 --- a/config/src/tests/frtconnectionpool/frtconnectionpool.cpp +++ b/config/src/tests/frtconnectionpool/frtconnectionpool.cpp @@ -1,5 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +#include <vespa/fastos/fastos.h> +#include <vespa/log/log.h> +LOG_SETUP("frtconnectionpool_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/config/frt/frtconnectionpool.h> #include <vespa/fnet/frt/error.h> diff --git a/config/src/tests/subscription/subscription.cpp b/config/src/tests/subscription/subscription.cpp index 5974279518a..e47f8b11e60 100644 --- a/config/src/tests/subscription/subscription.cpp +++ b/config/src/tests/subscription/subscription.cpp @@ -1,4 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config/common/misc.h> #include <vespa/config/common/configholder.h> diff --git a/config/src/tests/trace/trace.cpp b/config/src/tests/trace/trace.cpp index 195f7d659a9..566077d47e1 100644 --- a/config/src/tests/trace/trace.cpp +++ b/config/src/tests/trace/trace.cpp @@ -1,5 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - +#include <vespa/fastos/fastos.h> +#include <vespa/log/log.h> +LOG_SETUP("frt"); #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config/common/trace.h> #include <vespa/vespalib/trace/tracenode.h> diff --git a/config/src/vespa/config/helper/ifetchercallback.h b/config/src/vespa/config/helper/ifetchercallback.h index 50c26f2d3fc..9bc6e848827 100644 --- a/config/src/vespa/config/helper/ifetchercallback.h +++ b/config/src/vespa/config/helper/ifetchercallback.h @@ -26,11 +26,14 @@ public: template <typename ConfigType> class IFetcherCallback : public ICallback { +public: + virtual ~IFetcherCallback() { } protected: - void configure(std::unique_ptr<const ConfigInstance> config) override { + virtual void configure(std::unique_ptr<const ConfigInstance> config) override { configure(std::unique_ptr<ConfigType>(static_cast<const ConfigType *>(config.release()))); } virtual void configure(std::unique_ptr<ConfigType> config) = 0; }; } // namespace config + |