From dd79923295120adb14b28497792b717c452c095e Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 14 Feb 2015 17:09:14 +0000 Subject: Allow specifying the identity of the service object --- netfs/fuse/configuration.ice | 3 +++ netfs/fuse/fuse.cpp | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/netfs/fuse/configuration.ice b/netfs/fuse/configuration.ice index 6f76b37..db37770 100644 --- a/netfs/fuse/configuration.ice +++ b/netfs/fuse/configuration.ice @@ -7,6 +7,9 @@ module NetFS { ["slicer:name:export"] string ExportName; + ["slicer:name:service"] + string ServiceIdentity = "Service"; + ["slicer:name:endpoints"] EndpointList Endpoints; }; diff --git a/netfs/fuse/fuse.cpp b/netfs/fuse/fuse.cpp index ca504ac..e31ee03 100644 --- a/netfs/fuse/fuse.cpp +++ b/netfs/fuse/fuse.cpp @@ -76,9 +76,10 @@ NetFS::FuseApp::connectToService() } const std::string & ep = e->second->Endpoints.front(); - service = NetFS::ServicePrx::checkedCast(ic->stringToProxy("Service:" + ep)); + auto proxyAddr = e->second->ServiceIdentity + ":" + ep; + service = NetFS::ServicePrx::checkedCast(ic->stringToProxy(proxyAddr)); if (!service) { - throw std::runtime_error("Invalid service proxy: " + ep); + throw std::runtime_error("Invalid service proxy: " + proxyAddr); } } } -- cgit v1.2.3