summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-06-23 01:33:44 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2016-06-23 01:33:44 +0100
commite2d56ea817dcdf97061cbaf9d56fd5c0300eef6c (patch)
tree875d069757dcfecda806e9a8bc0fc89623a1bf7f
parentAdds basic install rules (diff)
downloadicespider-e2d56ea817dcdf97061cbaf9d56fd5c0300eef6c.tar.bz2
icespider-e2d56ea817dcdf97061cbaf9d56fd5c0300eef6c.tar.xz
icespider-e2d56ea817dcdf97061cbaf9d56fd5c0300eef6c.zip
Pass command line args through to Ice
-rw-r--r--icespider/core/core.cpp3
-rw-r--r--icespider/core/core.h2
-rw-r--r--icespider/fcgi/main.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/icespider/core/core.cpp b/icespider/core/core.cpp
index fffbed9..9f87bda 100644
--- a/icespider/core/core.cpp
+++ b/icespider/core/core.cpp
@@ -6,7 +6,7 @@
namespace ba = boost::algorithm;
namespace IceSpider {
- Core::Core()
+ Core::Core(int argc, char ** argv)
{
// Big enough to map all the request methods (an empty of zero lenght routes as default)
routes.resize(UserIceSpider::HttpMethod::OPTIONS + 1, {{ }});
@@ -21,6 +21,7 @@ namespace IceSpider {
}
Ice::InitializationData id;
+ id.properties = Ice::createProperties(argc, argv);
communicator = Ice::initialize(id);
}
diff --git a/icespider/core/core.h b/icespider/core/core.h
index 2f0a9a3..a6c42f6 100644
--- a/icespider/core/core.h
+++ b/icespider/core/core.h
@@ -13,7 +13,7 @@ namespace IceSpider {
typedef std::vector<Routes> LengthRoutes;
typedef std::vector<LengthRoutes> MethodRoutes;
- Core();
+ Core(int = 0, char ** = NULL);
~Core();
void process(IHttpRequest *) const;
diff --git a/icespider/fcgi/main.cpp b/icespider/fcgi/main.cpp
index 1d2e68c..7245ef9 100644
--- a/icespider/fcgi/main.cpp
+++ b/icespider/fcgi/main.cpp
@@ -8,7 +8,7 @@ DLL_PUBLIC
int
main(int argc, char ** argv, char ** env)
{
- IceSpider::Core core;
+ IceSpider::Core core(argc, argv);
if (!FCGX_IsCGI()) {
FCGX_Request request;