diff options
| author | randomdan <randomdan@localhost> | 2014-06-02 10:34:05 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2014-06-02 10:34:05 +0000 |
| commit | 57c121a887ae8c5947089eafda5709fcba5c3726 (patch) | |
| tree | 31f7856aa9a31e416cf7d2de7512450dd99d9b0c /netfs/daemon/daemonService.cpp | |
| parent | Test st_mode for the correct masks in ExecutableBy helper (diff) | |
| download | netfs-57c121a887ae8c5947089eafda5709fcba5c3726.tar.bz2 netfs-57c121a887ae8c5947089eafda5709fcba5c3726.tar.xz netfs-57c121a887ae8c5947089eafda5709fcba5c3726.zip | |
Use slicer for configuration reading, revise sample configs accordingly
Diffstat (limited to 'netfs/daemon/daemonService.cpp')
| -rw-r--r-- | netfs/daemon/daemonService.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/netfs/daemon/daemonService.cpp b/netfs/daemon/daemonService.cpp index 3a2e823..80305fd 100644 --- a/netfs/daemon/daemonService.cpp +++ b/netfs/daemon/daemonService.cpp @@ -2,9 +2,8 @@ #include "daemonService.h" #include "daemonVolume.h" -ServiceServer::ServiceServer(int16_t hs, DaemonConfigPtr c) : - config(c), - hostseed(hs) +ServiceServer::ServiceServer(NetFS::Daemon::ConfigurationPtr c) : + config(c) { } @@ -12,10 +11,10 @@ NetFS::VolumePrx ServiceServer::connect(const std::string & share, const std::string &, const Ice::Current & ice) { //boost::lock_guard<boost::mutex> lg(lock); - DaemonConfig::ExportMap::iterator e = config->exports.find(share); - if (e == config->exports.end()) { + NetFS::Daemon::ExportMap::iterator e = config->Exports.find(share); + if (e == config->Exports.end()) { throw NetFS::ConfigError(); } - return NetFS::VolumePrx::checkedCast(ice.adapter->addWithUUID(new VolumeServer(e->second->root, &uentries, &gentries))); + return NetFS::VolumePrx::checkedCast(ice.adapter->addWithUUID(new VolumeServer(e->second->RootPath, &uentries, &gentries))); } |