← Back to branch summary

~unity-api-team/unity-scopes-api/child-scopes-option

« back to all changes in this revision

Viewing changes to src/internal/MiddlewareFactoryConfig.cpp

  • Committer: Michi Henning
  • Date: 2013-11-19 02:51:46 UTC
  • mto: This revision was merged to the branch mainline in revision 62.
  • Revision ID: michi.henning@canonical.com-20131119025146-kglcalpphl4ozzk7
Fixed scoperegistry to use new scoperunner and to figure out which scopes to run from config files.
Still to do:
- deal with overrides and OEM scopes, particularly the grouping aspect.
- SignalThread needs to invoke a callback for clean shut-down on receipt of SIGINT.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/internal/MiddlewareFactoryConfig.cpp
43
43
{
44
44
}
45
45
 
46
 
string MiddlewareFactoryConfig::ice_configfile() const
 
46
string MiddlewareFactoryConfig::zmq_configfile() const
47
47
{
48
 
    return get_string(MIDDLEWARE_FACTORY_CONFIG_GROUP, "Ice.Configfile");
 
48
    return get_string(MIDDLEWARE_FACTORY_CONFIG_GROUP, "Zmq.ConfigFile");
49
49
}
50
50
 
51
51
string MiddlewareFactoryConfig::rest_configfile() const
52
52
{
53
 
    return get_string(MIDDLEWARE_FACTORY_CONFIG_GROUP, "REST.Configfile");
 
53
    return get_string(MIDDLEWARE_FACTORY_CONFIG_GROUP, "REST.ConfigFile");
54
54
}
55
55
} // namespace internal
56
56