diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-06-13 15:17:54 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-06-13 15:17:54 +0100 |
| commit | 5ef75bd1080dafa1c269a2cd1f4e16ae9a7da813 (patch) | |
| tree | 9a826feaae98a55e013d0e96972ec0df4f6f6372 /netfs/daemon/daemon.h | |
| parent | Move to C++0y (diff) | |
| parent | Move sandbox setup/teardown into a global fixture. (diff) | |
| download | netfs-5ef75bd1080dafa1c269a2cd1f4e16ae9a7da813.tar.bz2 netfs-5ef75bd1080dafa1c269a2cd1f4e16ae9a7da813.tar.xz netfs-5ef75bd1080dafa1c269a2cd1f4e16ae9a7da813.zip | |
Merge branch 'netfs-test-refactor'
Diffstat (limited to 'netfs/daemon/daemon.h')
| -rw-r--r-- | netfs/daemon/daemon.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/netfs/daemon/daemon.h b/netfs/daemon/daemon.h index 471a296..7ed5cb4 100644 --- a/netfs/daemon/daemon.h +++ b/netfs/daemon/daemon.h @@ -3,23 +3,29 @@ #include <Ice/Ice.h> #include <IceBox/IceBox.h> -#include <configuration.h> +#include <daemonConfig.h> #include <types.h> #include <boost/filesystem/path.hpp> class NetFSDaemon : public IceBox::Service { public: - virtual void start(const std::string&, const Ice::CommunicatorPtr&, const Ice::StringSeq&); - virtual void stop(); + NetFSDaemon(const Ice::CommunicatorPtr &); + virtual ~NetFSDaemon(); + + virtual void start(const std::string&, const Ice::CommunicatorPtr&, const Ice::StringSeq&) override; + virtual void stop() override; + + protected: + virtual NetFS::Daemon::ConfigurationPtr ReadConfiguration(const boost::filesystem::path & path) const; private: void LoadConfiguration(const boost::filesystem::path & path); - Ice::CommunicatorPtr ic; + const Ice::CommunicatorPtr ic; Ice::ObjectAdapterPtr adapter; NetFS::Daemon::RuntimeConfigurationPtr dc; - static std::string hostname(); + std::string hostname(); }; class TempPrivs { |